SELECT refactor.