Slight whetting my palatte on the code base.  Cleanup, simplify, refactor, but no changes.