Clean up
Clean up makefile