#160 tidied up game cancelling code