Refactoring

- unread events data structure change