Cleaneed up the time_integral and timeInt functions