Updated EventSys according to review

Did changes suggested in comments, please review.