Refactor events information