Refactored clock