Chore/cleanup makefile