Timer: Minor code tidyup