Fix Makefile
Makefile refactoring