Whitespace cleanup

Curse you, cut & paste!