More routes cleaning, took logic out of a route, into a controller