Continued Refactoring