Improve the Makefile