Update Makefile

Code polishing