Refactor question controller