a few more pep8 fixes