Refactoring white space