Simplify the router