diff --git a/src/main/java/com/meta/chatbridge/ServicesRunner.java b/src/main/java/com/meta/chatbridge/ServicesRunner.java
index 47c3ce4..fa21748 100644
--- a/src/main/java/com/meta/chatbridge/ServicesRunner.java
+++ b/src/main/java/com/meta/chatbridge/ServicesRunner.java
@@ -18,11 +18,10 @@
 
 public class ServicesRunner implements AutoCloseable {
   private final Javalin app = Javalin.create();
+  private final Set<Service<?>> services = new HashSet<>();
   private boolean started = false;
   private int port = 8080;
 
-  private final Set<Service<?>> services = new HashSet<>();
-
   private ServicesRunner() {}
 
   public static ServicesRunner newInstance() {
diff --git a/src/main/java/com/meta/chatbridge/message/Message.java b/src/main/java/com/meta/chatbridge/message/Message.java
index fd9e674..53ca68c 100644
--- a/src/main/java/com/meta/chatbridge/message/Message.java
+++ b/src/main/java/com/meta/chatbridge/message/Message.java
@@ -13,6 +13,13 @@
 
 public interface Message {
 
+  static Identifier threadId(Identifier id1, Identifier id2) {
+    if (id1.compareTo(id2) <= 0) {
+      return Identifier.from(id1.toString() + '|' + id2);
+    }
+    return Identifier.from(id2.toString() + '|' + id1);
+  }
+
   Instant timestamp();
 
   Identifier instanceId();
@@ -25,20 +32,13 @@ public interface Message {
 
   Role role();
 
+  default Identifier threadId() {
+    return threadId(senderId(), recipientId());
+  }
+
   enum Role {
     ASSISTANT,
     USER,
     SYSTEM
   }
-
-  static Identifier threadId(Identifier id1, Identifier id2) {
-    if (id1.compareTo(id2) <= 0) {
-      return Identifier.from(id1.toString() + '|' + id2);
-    }
-    return Identifier.from(id2.toString() + '|' + id1);
-  }
-
-  default Identifier threadId() {
-    return threadId(senderId(), recipientId());
-  }
 }