Simplify timer logic