change TripCalculator to Calculator