Cleaning up the routes a little bit