Extract timestamp logic into a separate method (#261)

Extract timestamp logic into a separate method (#261) #154