Tidy up classes controller