refactoring - more pep8 changes