more mostly-whitespace pep8 fixes