Improvements on Makefile