Continue to refactor.