Flake 8 fixes