Comment and reorganize Event model