White-space cleanup