pep8 compatibility fixes