Additional whitespace cleanups