more white-space cleanup