Cleaned up routes a bit.