White space clean up