clocks - tidy a few things up