Refactor, simplify, make the pictured clock the canonical clock.