A slight refactor.