minor, superficial edits (renaming classes, word smithing)