Time tag refactor and add some comments