Added comments to event-handler