whitespace and formatting cleanups