Improved the makefile