Refactor announcement