Whitespace cleanup again