diff --git a/src/main/java/buttondevteam/chat/components/formatter/ChatProcessing.java b/src/main/java/buttondevteam/chat/components/formatter/ChatProcessing.java
index e4b26b3..7c5148b 100644
--- a/src/main/java/buttondevteam/chat/components/formatter/ChatProcessing.java
+++ b/src/main/java/buttondevteam/chat/components/formatter/ChatProcessing.java
@@ -265,7 +265,7 @@ public class ChatProcessing {
 					System.out.println(message);
 			};
 
-			if (names.length > 0) //Add as first so it handles special characters (_) - TODO: But after URLs
+			if (names.length > 0) //Add as first so it handles special characters (_) - though the order of the different types are defined
 				formatters.add(0, new StringMatchProvider("name", FormatSettings.builder().color(Color.Aqua)
 					.onmatch((match, builder, section) -> {
 						Player p = Bukkit.getPlayer(match);
diff --git a/src/main/java/buttondevteam/chat/components/formatter/formatting/ChatFormatter.java b/src/main/java/buttondevteam/chat/components/formatter/formatting/ChatFormatter.java
index 1b6db79..4606097 100644
--- a/src/main/java/buttondevteam/chat/components/formatter/formatting/ChatFormatter.java
+++ b/src/main/java/buttondevteam/chat/components/formatter/formatting/ChatFormatter.java
@@ -260,7 +260,7 @@ public final class ChatFormatter {
 	private static void sortSections(ArrayList<FormattedSection> sections) {
 		sections.sort(
 			(s1, s2) -> s1.Start == s2.Start
-				? s1.End == s2.End ? 0 : Integer.compare(s1.End, s2.End) //TODO: Test
+				? s1.End == s2.End ? 0 : Integer.compare(s1.End, s2.End)
 				: Integer.compare(s1.Start, s2.Start));
 	}