Streamlined routes, cleaned up configuration somewhat