refactoring Makefile???