Some flake8 cleanup.