Tech Debt: flake8 cleanup