Refined Makefile more