Refactor Trips to Tanks