Improved Classroom form validation