Minor whitespace cleanups