refactor managed router
updates
fix typos after refactor
cleanup