fixup! Rewrite Makefile for clarity