Cleaning up the controllers and routes