fixes for pep8, name fixes