Improve Makefile