ClockService Refactoring