Refactor events/info