Simple refactor.