refactoring continues, with an end in sight