Refactor whitespace