change trip-calculator to singleton