diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java
index 73805625c..c8c8935b8 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java
@@ -121,47 +121,52 @@ public class IslandTeamCommand extends CompositeCommand {
                             TextVariables.RANK, user.getTranslation(getPlugin().getRanksManager().getRank(rank)),
                             TextVariables.NUMBER, String.valueOf(island.getMemberSet(rank, false).size()));
                 }
-                for (UUID member : island.getMemberSet(rank, false)) {
-                    OfflinePlayer offlineMember = Bukkit.getOfflinePlayer(member);
-                    if (onlineMembers.contains(member)) {
-                        // the player is online
-                        user.sendMessage("commands.island.team.info.member-layout.online",
-                                TextVariables.NAME, offlineMember.getName());
-                    } else {
-                        // A bit of handling for the last joined date
-                        Instant lastJoined = Instant.ofEpochMilli(offlineMember.getLastPlayed());
-                        Instant now = Instant.now();
+                displayOnOffline(user, rank, island, onlineMembers);
+            }
+        }
+    }
 
-                        Duration duration = Duration.between(lastJoined, now);
-                        String lastSeen;
-                        final String reference = "commands.island.team.info.last-seen.layout";
-                        if (duration.toMinutes() < 60L) {
-                            lastSeen = user.getTranslation(reference,
-                                    TextVariables.NUMBER, String.valueOf(duration.toMinutes()),
-                                    TextVariables.UNIT, user.getTranslation("commands.island.team.info.last-seen.minutes"));
-                        } else if (duration.toHours() < 24L) {
-                            lastSeen = user.getTranslation(reference,
-                                    TextVariables.NUMBER, String.valueOf(duration.toHours()),
-                                    TextVariables.UNIT, user.getTranslation("commands.island.team.info.last-seen.hours"));
-                        } else {
-                            lastSeen = user.getTranslation(reference,
-                                    TextVariables.NUMBER, String.valueOf(duration.toDays()),
-                                    TextVariables.UNIT, user.getTranslation("commands.island.team.info.last-seen.days"));
-                        }
+    private void displayOnOffline(User user, int rank, Island island, List<UUID> onlineMembers) {
+        for (UUID member : island.getMemberSet(rank, false)) {
+            OfflinePlayer offlineMember = Bukkit.getOfflinePlayer(member);
+            if (onlineMembers.contains(member)) {
+                // the player is online
+                user.sendMessage("commands.island.team.info.member-layout.online",
+                        TextVariables.NAME, offlineMember.getName());
+            } else {
+                // A bit of handling for the last joined date
+                Instant lastJoined = Instant.ofEpochMilli(offlineMember.getLastPlayed());
+                Instant now = Instant.now();
 
-                        if(island.getMemberSet(RanksManager.MEMBER_RANK, true).contains(member)) {
-                            user.sendMessage("commands.island.team.info.member-layout.offline",
-                                    TextVariables.NAME, offlineMember.getName(),
-                                    "[last_seen]", lastSeen);
-                        }else{
-                            // This will prevent anyone that is trusted or below to not have a last-seen status
-                            user.sendMessage("commands.island.team.info.member-layout.offline-not-last-seen",
-                                    TextVariables.NAME, offlineMember.getName());
-                        }
-                    }
+                Duration duration = Duration.between(lastJoined, now);
+                String lastSeen;
+                final String reference = "commands.island.team.info.last-seen.layout";
+                if (duration.toMinutes() < 60L) {
+                    lastSeen = user.getTranslation(reference,
+                            TextVariables.NUMBER, String.valueOf(duration.toMinutes()),
+                            TextVariables.UNIT, user.getTranslation("commands.island.team.info.last-seen.minutes"));
+                } else if (duration.toHours() < 24L) {
+                    lastSeen = user.getTranslation(reference,
+                            TextVariables.NUMBER, String.valueOf(duration.toHours()),
+                            TextVariables.UNIT, user.getTranslation("commands.island.team.info.last-seen.hours"));
+                } else {
+                    lastSeen = user.getTranslation(reference,
+                            TextVariables.NUMBER, String.valueOf(duration.toDays()),
+                            TextVariables.UNIT, user.getTranslation("commands.island.team.info.last-seen.days"));
+                }
+
+                if(island.getMemberSet(RanksManager.MEMBER_RANK, true).contains(member)) {
+                    user.sendMessage("commands.island.team.info.member-layout.offline",
+                            TextVariables.NAME, offlineMember.getName(),
+                            "[last_seen]", lastSeen);
+                } else {
+                    // This will prevent anyone that is trusted or below to not have a last-seen status
+                    user.sendMessage("commands.island.team.info.member-layout.offline-not-last-seen",
+                            TextVariables.NAME, offlineMember.getName());
                 }
             }
         }
+
     }
 
     private boolean fireEvent(User user) {