Address #327: Revise the text for event handler and events