Cleaned up some code, reduced the number of total routes.