Refine Makefile