Cleaned up the timer logic
Update