minor clean up and removal of unnecessary time unit conversions