cleaned up routes, models, and controllers