Tweaks to the clock code

This doesn't change anything, it should just be a bit clearer.