Refactor - Update makefile