refactor question