Started cleaning event types
Finished basic analysis