Refactor time-tagger