I dislike whitespace as much as the next guy, but when cleaning it up it's nice to do that as its own commit, so its not mixed in with more substantial changes.