Refactor Makefile a bit