Continued Refactorings