Minor whitespace refactoring