[TimerEntry] Some code cleanup