And yet moar flake8 fixes