Small refactoring of makefile