Stop the timer properly and wait for it to finish
Reorder things
Performance