Whitespace cleanup