Tidy and simplify recording-timer
Checkpoint