controller cleanup and added some comments to trips/show