a bunch of pep8 fixes