Refactoring Question object to set up for multiple formats, and better MVC separation