Flake8 adjustments