Fixing flake8 violations W291