Various whitespace cleanups