a few more Pep8 changes