Whitespace cleanups