Fancier makefile
Clean up