cleaning up routes a little