refactory Clock . TEST OK