Refactoring the syntax, update Makefile
Refactoring the syntax, update Makefile