Cleanup makefile slightly