Cleaning up classroom controller to use better view models