PEP8 fixes for new version of pep8