rest of pep8 fixes