Borrowed event cleanup from Andrey

The usage changed from event_type to event