Make event stuff clearer