Add class_and_number field to student, clean specs