Make event case clearer