Fixing flake8 violations