minor clean up in TimeService