Readability: white space fixes