Whitespace cleanup

This should be a simple, though tedious PR to review. Thoughts @macfanatic?