Rafactor the timer