A bunch of flake8 fixes