Updated Makefile format