A handle of flake8 fixes