whitespace and line length cleanups