Pep8 fixes

I went a little overboard with code-beautifying tools.