refactor Makefile
Refactor Makefile again