Renamned and removed comments on eventhandling