diff --git a/bungee/src/main/java/net/pistonmaster/pistonqueue/bungee/commands/BungeeComponentWrapperImpl.java b/bungee/src/main/java/net/pistonmaster/pistonqueue/bungee/commands/BungeeComponentWrapperImpl.java
index 8030606d..0070a81a 100644
--- a/bungee/src/main/java/net/pistonmaster/pistonqueue/bungee/commands/BungeeComponentWrapperImpl.java
+++ b/bungee/src/main/java/net/pistonmaster/pistonqueue/bungee/commands/BungeeComponentWrapperImpl.java
@@ -19,19 +19,13 @@
  */
 package net.pistonmaster.pistonqueue.bungee.commands;
 
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.pistonmaster.pistonqueue.shared.ComponentWrapper;
 import net.pistonmaster.pistonqueue.shared.TextColorWrapper;
 import net.pistonmaster.pistonqueue.shared.TextDecorationWrapper;
 
-@Getter
-@RequiredArgsConstructor
-public final class BungeeComponentWrapperImpl implements ComponentWrapper {
-    private final ComponentBuilder mainComponent;
-
+public record BungeeComponentWrapperImpl(ComponentBuilder mainComponent) implements ComponentWrapper {
     @Override
     public ComponentWrapper append(String text) {
         return new BungeeComponentWrapperImpl(mainComponent.append(text));
@@ -39,26 +33,17 @@ public ComponentWrapper append(String text) {
 
     @Override
     public ComponentWrapper append(ComponentWrapper component) {
-        return new BungeeComponentWrapperImpl(mainComponent.append(((BungeeComponentWrapperImpl) component).getMainComponent().create()));
+        return new BungeeComponentWrapperImpl(mainComponent.append(((BungeeComponentWrapperImpl) component).mainComponent().create()));
     }
 
     @Override
     public ComponentWrapper color(TextColorWrapper color) {
-        ChatColor chatColor = null;
-        switch (color) {
-            case GOLD:
-                chatColor = ChatColor.GOLD;
-                break;
-            case RED:
-                chatColor = ChatColor.RED;
-                break;
-            case DARK_BLUE:
-                chatColor = ChatColor.DARK_BLUE;
-                break;
-            case GREEN:
-                chatColor = ChatColor.GREEN;
-                break;
-        }
+        ChatColor chatColor = switch (color) {
+            case GOLD -> ChatColor.GOLD;
+            case RED -> ChatColor.RED;
+            case DARK_BLUE -> ChatColor.DARK_BLUE;
+            case GREEN -> ChatColor.GREEN;
+        };
 
         return new BungeeComponentWrapperImpl(mainComponent.color(chatColor));
     }
diff --git a/bungee/src/main/java/net/pistonmaster/pistonqueue/bungee/commands/MainCommand.java b/bungee/src/main/java/net/pistonmaster/pistonqueue/bungee/commands/MainCommand.java
index 5e0480ce..cc67a299 100644
--- a/bungee/src/main/java/net/pistonmaster/pistonqueue/bungee/commands/MainCommand.java
+++ b/bungee/src/main/java/net/pistonmaster/pistonqueue/bungee/commands/MainCommand.java
@@ -42,7 +42,7 @@ public void execute(CommandSender sender, String[] args) {
         onCommand(new CommandSourceWrapper() {
             @Override
             public void sendMessage(ComponentWrapper component) {
-                sender.sendMessage(((BungeeComponentWrapperImpl) component).getMainComponent().create());
+                sender.sendMessage(((BungeeComponentWrapperImpl) component).mainComponent().create());
             }
 
             @Override
diff --git a/bungee/src/main/java/net/pistonmaster/pistonqueue/bungee/utils/ChatUtils.java b/bungee/src/main/java/net/pistonmaster/pistonqueue/bungee/utils/ChatUtils.java
index c056cea3..f43e80c9 100644
--- a/bungee/src/main/java/net/pistonmaster/pistonqueue/bungee/utils/ChatUtils.java
+++ b/bungee/src/main/java/net/pistonmaster/pistonqueue/bungee/utils/ChatUtils.java
@@ -34,19 +34,11 @@ public final class ChatUtils {
     private ChatUtils() {
     }
 
-    public static void sendMessage(ProxiedPlayer p, String str) {
-        sendMessage(MessageType.CHAT, p, str);
-    }
-
     public static void sendMessage(MessageType type, ProxiedPlayer p, String str) {
         if (!str.equalsIgnoreCase("/")) {
             switch (type) {
-                case CHAT:
-                    p.sendMessage(ChatMessageType.CHAT, parseToComponent(str));
-                    break;
-                case ACTION_BAR:
-                    p.sendMessage(ChatMessageType.ACTION_BAR, parseToComponent(str));
-                    break;
+                case CHAT -> p.sendMessage(ChatMessageType.CHAT, parseToComponent(str));
+                case ACTION_BAR -> p.sendMessage(ChatMessageType.ACTION_BAR, parseToComponent(str));
             }
         }
     }
diff --git a/velocity/src/main/java/net/pistonmaster/pistonqueue/velocity/commands/MainCommand.java b/velocity/src/main/java/net/pistonmaster/pistonqueue/velocity/commands/MainCommand.java
index ecf66d6f..25784104 100644
--- a/velocity/src/main/java/net/pistonmaster/pistonqueue/velocity/commands/MainCommand.java
+++ b/velocity/src/main/java/net/pistonmaster/pistonqueue/velocity/commands/MainCommand.java
@@ -43,7 +43,7 @@ public void execute(Invocation invocation) {
         onCommand(new CommandSourceWrapper() {
             @Override
             public void sendMessage(ComponentWrapper component) {
-                sender.sendMessage(((VelocityComponentWrapperImpl) component).getMainComponent());
+                sender.sendMessage(((VelocityComponentWrapperImpl) component).mainComponent());
             }
 
             @Override
diff --git a/velocity/src/main/java/net/pistonmaster/pistonqueue/velocity/commands/VelocityComponentWrapperImpl.java b/velocity/src/main/java/net/pistonmaster/pistonqueue/velocity/commands/VelocityComponentWrapperImpl.java
index 7865632c..e5d47a01 100644
--- a/velocity/src/main/java/net/pistonmaster/pistonqueue/velocity/commands/VelocityComponentWrapperImpl.java
+++ b/velocity/src/main/java/net/pistonmaster/pistonqueue/velocity/commands/VelocityComponentWrapperImpl.java
@@ -19,8 +19,6 @@
  */
 package net.pistonmaster.pistonqueue.velocity.commands;
 
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextDecoration;
@@ -28,11 +26,7 @@
 import net.pistonmaster.pistonqueue.shared.TextColorWrapper;
 import net.pistonmaster.pistonqueue.shared.TextDecorationWrapper;
 
-@Getter
-@RequiredArgsConstructor
-public final class VelocityComponentWrapperImpl implements ComponentWrapper {
-    private final Component mainComponent;
-
+public record VelocityComponentWrapperImpl(Component mainComponent) implements ComponentWrapper {
     @Override
     public ComponentWrapper append(String text) {
         return new VelocityComponentWrapperImpl(mainComponent.append(Component.text(text)));
@@ -40,27 +34,17 @@ public ComponentWrapper append(String text) {
 
     @Override
     public ComponentWrapper append(ComponentWrapper component) {
-        return new VelocityComponentWrapperImpl(mainComponent.append(((VelocityComponentWrapperImpl) component).getMainComponent()));
+        return new VelocityComponentWrapperImpl(mainComponent.append(((VelocityComponentWrapperImpl) component).mainComponent()));
     }
 
     @Override
     public ComponentWrapper color(TextColorWrapper color) {
-        NamedTextColor namedTextColor = null;
-
-        switch (color) {
-            case GOLD:
-                namedTextColor = NamedTextColor.GOLD;
-                break;
-            case RED:
-                namedTextColor = NamedTextColor.RED;
-                break;
-            case DARK_BLUE:
-                namedTextColor = NamedTextColor.DARK_BLUE;
-                break;
-            case GREEN:
-                namedTextColor = NamedTextColor.GREEN;
-                break;
-        }
+        NamedTextColor namedTextColor = switch (color) {
+            case GOLD -> NamedTextColor.GOLD;
+            case RED -> NamedTextColor.RED;
+            case DARK_BLUE -> NamedTextColor.DARK_BLUE;
+            case GREEN -> NamedTextColor.GREEN;
+        };
 
         return new VelocityComponentWrapperImpl(mainComponent.color(namedTextColor));
     }
diff --git a/velocity/src/main/java/net/pistonmaster/pistonqueue/velocity/utils/ChatUtils.java b/velocity/src/main/java/net/pistonmaster/pistonqueue/velocity/utils/ChatUtils.java
index 5b2c344c..1eec0279 100644
--- a/velocity/src/main/java/net/pistonmaster/pistonqueue/velocity/utils/ChatUtils.java
+++ b/velocity/src/main/java/net/pistonmaster/pistonqueue/velocity/utils/ChatUtils.java
@@ -32,19 +32,11 @@ public final class ChatUtils {
     private ChatUtils() {
     }
 
-    public static void sendMessage(Player p, String str) {
-        sendMessage(MessageType.CHAT, p, str);
-    }
-
     public static void sendMessage(MessageType type, Player p, String str) {
         if (!str.equalsIgnoreCase("/")) {
             switch (type) {
-                case CHAT:
-                    p.sendMessage(parseToComponent(str));
-                    break;
-                case ACTION_BAR:
-                    p.sendActionBar(parseToComponent(str));
-                    break;
+                case CHAT -> p.sendMessage(parseToComponent(str));
+                case ACTION_BAR -> p.sendActionBar(parseToComponent(str));
             }
         }
     }