Fixing flake8 issues to fix build