Whitespace and spacing cleanup