refactor: routes
refactor: more destructuring