Bunch of flake8 fixes