refactor eventbundle