Improve the makefile