even more pep8 reformatting