Set initial values of time unit variables, and a tiny cleanup