fixed a bunch more of pep8 warnings