[refactor] reorder and comment events