Cleaning up the router, keeping it simple.