refactor timer
Merge pull request #1 from EricWF/fresh

refactor timer