ClockService Refactoring Part2