Refactoring Makefile