Issue #24 Cleanup of "make" and addition of "make clean"