diff --git a/src/main/java/world/bentobox/chat/commands/island/IslandChatCommand.java b/src/main/java/world/bentobox/chat/commands/island/IslandChatCommand.java
index a795439..bad6444 100644
--- a/src/main/java/world/bentobox/chat/commands/island/IslandChatCommand.java
+++ b/src/main/java/world/bentobox/chat/commands/island/IslandChatCommand.java
@@ -41,7 +41,7 @@ public boolean execute(User user, String label, List<String> args) {
 
         // Send the message directly into island chat without the need of toggling it
         // if there is existence of more arguments
-        if (args.size() > 0) {
+        if (!args.isEmpty()) {
             addon.getListener().islandChat(island, user.getPlayer(), String.join(" ", args));
             return true;
         }
diff --git a/src/main/java/world/bentobox/chat/commands/island/IslandTeamChatCommand.java b/src/main/java/world/bentobox/chat/commands/island/IslandTeamChatCommand.java
index cb38f6d..aa23bbe 100644
--- a/src/main/java/world/bentobox/chat/commands/island/IslandTeamChatCommand.java
+++ b/src/main/java/world/bentobox/chat/commands/island/IslandTeamChatCommand.java
@@ -39,7 +39,7 @@ public boolean execute(User user, String label, List<String> args) {
 
         // Send the message directly into team chat without the need of toggling it
         // if there is existence of more arguments
-        if (args.size() > 0) {
+        if (!args.isEmpty()) {
             addon.getListener().teamChat(user.getPlayer(), String.join(" ", args));
             return true;
         }
diff --git a/src/main/java/world/bentobox/chat/listeners/ChatListener.java b/src/main/java/world/bentobox/chat/listeners/ChatListener.java
index 3f7056e..1ddaad4 100644
--- a/src/main/java/world/bentobox/chat/listeners/ChatListener.java
+++ b/src/main/java/world/bentobox/chat/listeners/ChatListener.java
@@ -1,6 +1,10 @@
 package world.bentobox.chat.listeners;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -24,6 +28,7 @@
  */
 public class ChatListener implements Listener {
 
+    private static final String MESSAGE = "[message]";
     private final Chat addon;
     private final Set<UUID> teamChatUsers;
     private final Map<Island, Set<Player>> islands;
@@ -91,7 +96,7 @@ public void islandChat(Island i, Player player, String message) {
         Bukkit.getOnlinePlayers().stream().map(User::getInstance)
         .filter(u -> i.onIsland(u.getLocation()))
         // Send message to island
-        .forEach(u -> u.sendMessage("chat.island-chat.syntax", TextVariables.NAME, player.getName(), "[message]", message));
+        .forEach(u -> u.sendMessage("chat.island-chat.syntax", TextVariables.NAME, player.getName(), MESSAGE, message));
         // Log if required
         if (addon.getSettings().isLogTeamChats()) {
             addon.log("[Team Chat Log] " + player.getName() + ": " + message);
@@ -100,7 +105,7 @@ public void islandChat(Island i, Player player, String message) {
         Bukkit.getOnlinePlayers().stream()
         .filter(p -> islandSpies.contains(p.getUniqueId()))
         .map(User::getInstance)
-        .forEach(a -> a.sendMessage("chat.island-chat.spy.syntax", TextVariables.NAME, player.getName(), "[message]", message));
+        .forEach(a -> a.sendMessage("chat.island-chat.spy.syntax", TextVariables.NAME, player.getName(), MESSAGE, message));
     }
 
     public void teamChat(final Player player, String message) {
@@ -111,7 +116,7 @@ public void teamChat(final Player player, String message) {
         // Filter for online only
         .filter(User::isOnline)
         // Send the message to them
-        .forEach(target -> target.sendMessage("chat.team-chat.syntax", TextVariables.NAME, player.getName(), "[message]", message));
+        .forEach(target -> target.sendMessage("chat.team-chat.syntax", TextVariables.NAME, player.getName(), MESSAGE, message));
         // Log if required
         if (addon.getSettings().isLogTeamChats()) {
             addon.log("[Team Chat Log] " + player.getName() + ": " + message);
@@ -120,7 +125,7 @@ public void teamChat(final Player player, String message) {
         Bukkit.getOnlinePlayers().stream()
         .filter(p -> spies.contains(p.getUniqueId()))
         .map(User::getInstance)
-        .forEach(u -> u.sendMessage("chat.team-chat.spy.syntax", TextVariables.NAME, player.getName(), "[message]", message));
+        .forEach(u -> u.sendMessage("chat.team-chat.spy.syntax", TextVariables.NAME, player.getName(), MESSAGE, message));
     }
 
     /**