Minor refactor to Event