cleaning up.  About to separate Defined Terms.