Improve Makefiles