refactor-phase1
218ffb46 · wip refactor 20 [tests passing] ·