Better readability by optimizing whitespacing