Fixing flake8 failures