code cleanups, wip hatchet continues