refactoring whitespace