Continue refactoring.