Flake8 clean up