- Improve Makefile