Code Clean Up : EventService