Refactor quizzes