Cleaning up flake8 problems still.