diff --git a/sopel_SpiceBot_Core_Prerun/__init__.py b/sopel_SpiceBot_Core_Prerun/__init__.py
index 3048e43..073f684 100644
--- a/sopel_SpiceBot_Core_Prerun/__init__.py
+++ b/sopel_SpiceBot_Core_Prerun/__init__.py
@@ -83,37 +83,31 @@ def rebuild_pipes(commands, trigger_str_add=None):
 
     if not trigger_str_add:
         repipe_trigger_dict = commands[0]
+        index_value = 1
     else:
         repipe_trigger_dict = commands[1]
+        repipe_trigger_dict["trigger_str"] += " %s" % trigger_str_add
+        index_value = 2
 
-    trigger_number = 1
-    for trigger_dict in commands[1:]:
-
-        trigger_str = trigger_dict["trigger_str"]
-        splitkey_str = " %s " % sb.commands.pipe_split_key
-        if trigger_str_add and trigger_number == 1:
-            trigger_str += " %s" % trigger_str_add
-            splitkey_str = ""
+    for trigger_dict in commands[index_value:]:
 
         if trigger_dict["trigger_type"] == "command":
-            repipe_trigger_dict["trigger_str"] += "%s%s%s %s" % (splitkey_str,
-                                                                 trigger_dict["trigger_prefix"],
-                                                                 trigger_dict["trigger_command"],
-                                                                 trigger_str)
+            repipe_trigger_dict["trigger_str"] += " %s %s%s %s" % (sb.commands.pipe_split_key,
+                                                                   trigger_dict["trigger_prefix"],
+                                                                   trigger_dict["trigger_command"],
+                                                                   trigger_dict["trigger_str"])
 
         elif trigger_dict["trigger_type"] == "nickname_command":
-            repipe_trigger_dict["trigger_str"] += "%s%s %s %s" % (splitkey_str,
-                                                                  trigger_dict["trigger_prefix"],
-                                                                  trigger_dict["trigger_command"],
-                                                                  trigger_str)
+            repipe_trigger_dict["trigger_str"] += " %s %s %s %s" % (sb.commands.pipe_split_key,
+                                                                    trigger_dict["trigger_prefix"],
+                                                                    trigger_dict["trigger_command"],
+                                                                    trigger_dict["trigger_str"])
 
         elif trigger_dict["trigger_type"] == "action_command":
-            repipe_trigger_dict["trigger_str"] += "%s%s %s %s" % (splitkey_str,
-                                                                  "/me",
-                                                                  trigger_dict["trigger_command"],
-                                                                  trigger_str)
-
-        trigger_number += 1
+            repipe_trigger_dict["trigger_str"] += " %s %s %s %s" % (sb.commands.pipe_split_key,
+                                                                    "/me",
+                                                                    trigger_dict["trigger_command"],
+                                                                    trigger_dict["trigger_str"])
 
     return repipe_trigger_dict