Refactor Events for cleanliness