Refactor whitespace.