More cleanup for flake8