timeline: Refactor event