(some) pep8 cleanup