Improve default makefile