Minor tweaks to timer toggle code