eventType refactor correction