Clean up white space

Clean up dangling white space to reduce noise in later commits/pull request diffs.