White space cleanup