cleaning up the routes a bit more