Reformatted
Refactored event structure
Some fixes