Move from route closures to controllers