Rework timer usage