Whitespace and formatting cleanup

At some point I should consider just using pyflakes and/or pep8.