Whitespace and formatting cleanup