whitespace cleanup (round 2)