Refactor time Now()