Cleaned up the event object and added update event state