Improved the Makefile