Rewrite Makefile for clarity