grouped routes, removed unnecessary code