minor cleanup
use Stop instead of Cancel