Some whitespace refactoring