White space refactoring