Midway through a refactoring frenzy