some whitespace cleanups