Clean up makefile a little bit