Cleaned up routes a little bit