Whitespace cleanup

Misplaced whitespace fixed, no functional changes

I can collect all these trivial changes and commit them later if necessary, but the interfere with my workflow ...