Refactor unify time units