Move TimeUtil to own class