Whitespace and layout cleanup