diff --git a/modules/fediverse/__init__.py b/modules/fediverse/__init__.py
index f80607d3..384d1e9f 100644
--- a/modules/fediverse/__init__.py
+++ b/modules/fediverse/__init__.py
@@ -97,20 +97,19 @@ class Module(ModuleManager.BaseModule):
             type = note["type"]
             note = note["object"]
 
-        cw, out, url = ap_utils.format_note(actor, note, type)
+        cw, author, content, url = ap_utils.parse_note(actor, note, type)
         shorturl = self.exports.get_one("shorturl")(event["server"], url,
             context=event["target"])
 
         if cw:
             if strict_cw:
-                out = "CW: %s - %s" % (cw, shorturl)
+                out = "%s: CW %s - %s" % (author, cw, shorturl)
             else:
-                out = "(CW %s) %s - %s" % (cw, out, shorturl)
+                out = "(CW %s) %s: %s - %s" % (cw, author, content, shorturl)
         else:
-            out = "%s - %s" % (out, shorturl)
+            out = "%s: %s - %s" % (author, content, shorturl)
         event["stdout"].write(out)
 
-
     def _get_from_outbox(self, username, instance):
         try:
             actor_url = ap_utils.find_actor(username, instance)
diff --git a/modules/fediverse/ap_utils.py b/modules/fediverse/ap_utils.py
index 686b8850..3f5b6312 100644
--- a/modules/fediverse/ap_utils.py
+++ b/modules/fediverse/ap_utils.py
@@ -123,7 +123,7 @@ def _content(note):
 
         return "<%s>" % filename
 
-def format_note(actor, note, type="Create"):
+def parse_note(actor, note, type="Create"):
     if type == "Announce":
         retoot_url = note
         retoot_instance = urllib.parse.urlparse(retoot_url).hostname
@@ -135,14 +135,15 @@ def format_note(actor, note, type="Create"):
         retooted_user = "@%s@%s" % (original_tooter.username, retoot_instance)
         retoot_content = _content(retoot)
 
-        return (retoot.get("summary", None),  "%s (boost %s): %s" % (
-            actor.username, retooted_user, retoot_content), retoot_url)
+        author = "%s (boost %s)" % (actor.username, retooted_user)
+
+        return (retoot.get("summary", None), author, retoot_content, retoot_url)
+
 
     elif type == "Create":
         content = _content(note)
         url = note.get("url", note["id"])
 
-        return (note.get("summary", None),
-            "%s: %s" % (actor.username, content), url)
+        return note.get("summary", None), actor.username, content, url
 
-    return None, None, None
+    return None