Flake 8 ; clean up ; make it work