Refactor question