[Code] Some cleanup and revising the Makefile.