add inheritance to events
remove comments