more pep8 reformatting