[refactor] minor modification to eventing logic