Coding-style updates (whitespace related)