Added some improvement on Makefile rules