Refactored student_count