refactor whitepaces