Refactor question and answer corresponding stuff