Refactor logic into Router::Response