style(events): code cleanup