Minor refactoring of TimerManager
Minor refactoring
Minor refactoring for testability
Merge pull request #32 from OldSneerJaw/refactor

Misc. refactoring