Whitespace cleanup

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