Clean up more flake8 violations