Clean up makefile a little