Fixing flake 8 errors
Merge branch 'tech-enhance/7271-fix-flake-8'