Partial pep8 cleanup