Improved Makefile