cleanup style violations for the new version of pep8