Cleaned the Event class