some more pep8 changes