more pep8 code cleanup