fixed flake8 errors
stashed changes