Updates formatting for announcement, refactors a bit