cleaned up routes, controllers