Clean up Makefile a bit