Code clean up for EventService and EventController