Clear timeout before changing state to avoid race condition

[darobin]

Additionally changed clearInterval() to clearTimeout(). They do the same thing, but the intent is clearer.