another batch of pep8 fixes