More refactoring in MultipleChoicesController
Refactoring repeated controller code to be more DRY