- refactor Timer code