Refactor ToulouseCtrl