more modern pep8 fixes