Cleanup makefile a bit