refactor(event_handler): refactoring params to reduce code (#8124)

refactor(event_handler): refactoring params to reduce code (#8124) #4918