Good refactor.