Refactor peer announcement
avatar foobar