Minor refactoring in Timer class following code review.