Minor cleanup of Makefile