Refactoring continues 2