Adjust indentation.
Add removeFromTrip handling.