Cleanup
Minor cleanup of Makefile