white-space cleanup