cleaned up the routing stuffs