Classroom refactor