Simplified the routes