fix pep8 conflicts