Continue with refactor.