whitespace and formatting cleanups from latest commit