cleaning up Router::handle