Refactor question model