pep8 cleanup, where it makes sense