Refactor Clock