cleaned up some routes, names and data validation