Another refactor.