more whitespace refactoring