Flake 8 changes