Overhaul Makefile