Small optimizations in tutors controller