Refactor announcements