Flake8 changes