Minor edits to makefile for cleanup