flake8 fixes
Flake8 fixes