Clock Refactory OK