Fixed small bug in timer after game over
Small logic clean-up