Clean up the Makefile a little