Friendlier Makefile, some refactors