pep8 cleanup continues