Deal with pep8 errors in affected files