added more pep8 cleanup