diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java
index 389c553af8..8924e5e9df 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java
@@ -52,25 +52,23 @@ public class PlayerCountOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (pvpToolsPlugin.isCountPlayers())
-		{
-			if ((client.getVar(Varbits.IN_WILDERNESS) == 1) || WorldType.isPvpWorld(client.getWorldType())
+		if (pvpToolsPlugin.isCountPlayers() &&
+			(client.getVar(Varbits.IN_WILDERNESS) == 1 || WorldType.isPvpWorld(client.getWorldType())
 				|| ArrayUtils.contains(CLAN_WARS_REGIONS, client.getMapRegions()[0]) ||
-				WorldType.isDeadmanWorld(client.getWorldType()))
-			{
-				// Make this stop showing up when its not relevant
-				TableComponent tableComponent = new TableComponent();
-				TableElement[] firstRowElements = {
-					TableElement.builder().content("Friendly").color(Color.GREEN).build(),
-					TableElement.builder().content(String.valueOf(pvpToolsPlugin.getFriendlyPlayerCount())).build()};
-				TableRow firstRow = TableRow.builder().elements(Arrays.asList(firstRowElements)).build();
-				TableElement[] secondRowElements = {
-					TableElement.builder().content("Enemy").color(Color.RED).build(),
-					TableElement.builder().content(String.valueOf(pvpToolsPlugin.getEnemyPlayerCount())).build()};
-				TableRow secondRow = TableRow.builder().elements(Arrays.asList(secondRowElements)).build();
-				tableComponent.addRows(firstRow, secondRow);
-				return tableComponent.render(graphics);
-			}
+				WorldType.isDeadmanWorld(client.getWorldType())))
+		{
+			// Make this stop showing up when its not relevant
+			TableComponent tableComponent = new TableComponent();
+			TableElement[] firstRowElements = {
+				TableElement.builder().content("Friendly").color(Color.GREEN).build(),
+				TableElement.builder().content(String.valueOf(pvpToolsPlugin.getFriendlyPlayerCount())).build()};
+			TableRow firstRow = TableRow.builder().elements(Arrays.asList(firstRowElements)).build();
+			TableElement[] secondRowElements = {
+				TableElement.builder().content("Enemy").color(Color.RED).build(),
+				TableElement.builder().content(String.valueOf(pvpToolsPlugin.getEnemyPlayerCount())).build()};
+			TableRow secondRow = TableRow.builder().elements(Arrays.asList(secondRowElements)).build();
+			tableComponent.addRows(firstRow, secondRow);
+			return tableComponent.render(graphics);
 		}
 		return null;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java
index 5b8a3f7f1c..5aceb68fa7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java
@@ -40,13 +40,10 @@ public class PvpToolsOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (pvpToolsPlugin.isFallInHelper())
+		if (pvpToolsPlugin.isFallInHelper() && pvpToolsPlugin.fallinHelperEnabled)
 		{
-			if (pvpToolsPlugin.fallinHelperEnabled)
-			{
-				graphics.setFont(FontManager.getRunescapeFont().deriveFont(28));
-				OverlayUtil.renderTextLocation(graphics, new Point(200, 80), "FALL IN HELPER ENABLED", Color.YELLOW);
-			}
+			graphics.setFont(FontManager.getRunescapeFont().deriveFont(28));
+			OverlayUtil.renderTextLocation(graphics, new Point(200, 80), "FALL IN HELPER ENABLED", Color.YELLOW);
 		}
 		return null;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java
index c3bc84aef1..b0b7d100f4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java
@@ -195,12 +195,9 @@ public class PvpToolsPlugin extends Plugin
 			if (!Objects.isNull(clanMember))
 			{
 				List<String> arrayList = ccMembers.stream().map(player -> Text.removeTags(Text.standardize(player.getName()))).collect(Collectors.toList());
-				if (!arrayList.contains(Text.removeTags(Text.standardize(clanMember.getUsername()))))
+				if (!arrayList.contains(Text.removeTags(Text.standardize(clanMember.getUsername()))) && !missingMembers.contains(clanMember.getUsername()))
 				{
-					if (!missingMembers.contains(clanMember.getUsername()))
-					{
-						missingMembers.add("[W" + clanMember.getWorld() + "] - " + clanMember.getUsername());
-					}
+					missingMembers.add("[W" + clanMember.getWorld() + "] - " + clanMember.getUsername());
 				}
 			}
 		}
@@ -217,12 +214,9 @@ public class PvpToolsPlugin extends Plugin
 			if (!Objects.isNull(clanMember))
 			{
 				List<String> arrayList = ccMembers.stream().map(player -> Text.removeTags(Text.standardize(player.getName()))).collect(Collectors.toList());
-				if (arrayList.contains(Text.removeTags(Text.standardize(clanMember.getUsername()))))
+				if (arrayList.contains(Text.removeTags(Text.standardize(clanMember.getUsername()))) && !currentMembers.contains(clanMember.getUsername()))
 				{
-					if (!currentMembers.contains(clanMember.getUsername()))
-					{
-						currentMembers.add(clanMember.getUsername());
-					}
+					currentMembers.add(clanMember.getUsername());
 				}
 			}
 		}
@@ -370,12 +364,9 @@ public class PvpToolsPlugin extends Plugin
 		{
 			getCarriedWealth();
 		}
-		if (event.getGameState().equals(GameState.LOGGED_IN))
+		if (event.getGameState().equals(GameState.LOGGED_IN) && this.countPlayers)
 		{
-			if (this.countPlayers)
-			{
-				updatePlayers();
-			}
+			updatePlayers();
 		}
 	}
 
@@ -478,25 +469,20 @@ public class PvpToolsPlugin extends Plugin
 		overheadCount = new int[]{0, 0, 0};
 		for (Player p : client.getPlayers())
 		{
-			if (Objects.nonNull(p))
+			if (Objects.nonNull(p) && PvPUtil.isAttackable(client, p) &&
+				!p.isClanMember() && !(p.getOverheadIcon() == null))
 			{
-				if (PvPUtil.isAttackable(client, p))
+				switch (p.getOverheadIcon())
 				{
-					if (!p.isClanMember() && !(p.getOverheadIcon() == null))
-					{
-						switch (p.getOverheadIcon())
-						{
-							case MAGIC:
-								overheadCount[0]++;
-								break;
-							case RANGED:
-								overheadCount[1]++;
-								break;
-							case MELEE:
-								overheadCount[2]++;
-								break;
-						}
-					}
+					case MAGIC:
+						overheadCount[0]++;
+						break;
+					case RANGED:
+						overheadCount[1]++;
+						break;
+					case MELEE:
+						overheadCount[2]++;
+						break;
 				}
 			}
 		}
@@ -548,12 +534,9 @@ public class PvpToolsPlugin extends Plugin
 		panel.totalRiskLabel.repaint();
 
 		int itemLimit = 0;
-		if (client.getLocalPlayer().getSkullIcon() != null)
+		if (client.getLocalPlayer().getSkullIcon() != null && client.getLocalPlayer().getSkullIcon() == SkullIcon.SKULL)
 		{
-			if (client.getLocalPlayer().getSkullIcon() == SkullIcon.SKULL)
-			{
-				itemLimit = 1;
-			}
+			itemLimit = 1;
 		}
 		if (client.getLocalPlayer().getSkullIcon() == null)
 		{