various pep8 fixes