Improved makefile