More refactoring of QuizCtrl