More refactoring in MultipleChoicesController