Minor cleanup to Makefile