Continue refactor.