Rework Makefile