Makefile - refactoring