diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java
index f72861e03b..733f89c249 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java
@@ -26,6 +26,7 @@
 package net.runelite.client.plugins.barbarianassault;
 
 import com.google.common.collect.Sets;
+import java.util.List;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
@@ -41,7 +42,7 @@ class BarbarianAssaultMenu
 {
 	private final MenuManager menuManager;
 	private final BarbarianAssaultPlugin game;
-	private final ArrayList<ComparableEntry> tracker = new ArrayList<>();
+	private final List<ComparableEntry> tracker = new ArrayList<>();
 	@Getter(AccessLevel.PACKAGE)
 	@Setter(AccessLevel.PACKAGE)
 	private boolean hornUpdated = false;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
index 4f8d29fe87..c4aedc1cbb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
@@ -183,16 +183,16 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 	private Font font = null;
 
 	@Getter
-	private final HashMap<WorldPoint, Integer> redEggs = new HashMap<>();
+	private final Map<WorldPoint, Integer> redEggs = new HashMap<>();
 
 	@Getter
-	private final HashMap<WorldPoint, Integer> greenEggs = new HashMap<>();
+	private final Map<WorldPoint, Integer> greenEggs = new HashMap<>();
 
 	@Getter
-	private final HashMap<WorldPoint, Integer> blueEggs = new HashMap<>();
+	private final Map<WorldPoint, Integer> blueEggs = new HashMap<>();
 
 	@Getter
-	private final HashMap<WorldPoint, Integer> yellowEggs = new HashMap<>();
+	private final Map<WorldPoint, Integer> yellowEggs = new HashMap<>();
 
 	@Getter
 	private final Map<Integer, Healer> healers = new HashMap<>();
@@ -234,9 +234,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 
 	private BufferedImage torsoImage, fighterImage, healerImage, rangerImage, runnerImage;
 
-	private ArrayList<TimerBox> deathTimes = new ArrayList<>();
+	private List<TimerBox> deathTimes = new ArrayList<>();
 
-	private HashMap<Integer, Projectile> projectiles = new HashMap<>();
+	private Map<Integer, Projectile> projectiles = new HashMap<>();
 
 	private TimerBox tickCounter;
 
@@ -645,7 +645,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 			return;
 		}
 
-		HashMap<WorldPoint, Integer> eggMap = getEggMap(itemSpawned.getItem().getId());
+		Map<WorldPoint, Integer> eggMap = getEggMap(itemSpawned.getItem().getId());
 		if (eggMap != null)
 		{
 			WorldPoint worldPoint = itemSpawned.getTile().getWorldLocation();
@@ -674,7 +674,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 
 		// If an egg despawns due to time and the collector is standing over it,
 		// a point will added as if the player picked it up
-		HashMap<WorldPoint, Integer> eggMap = getEggMap(itemId);
+		Map<WorldPoint, Integer> eggMap = getEggMap(itemId);
 		if (eggMap != null)
 		{
 			WorldPoint worldPoint = itemDespawned.getTile().getWorldLocation();
@@ -1590,7 +1590,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 		yellowEggs.clear();
 	}
 
-	private HashMap<WorldPoint, Integer> getEggMap(int itemID)
+	private Map<WorldPoint, Integer> getEggMap(int itemID)
 	{
 		switch (itemID)
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java
index 997493e694..df5b7423b4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java
@@ -28,6 +28,7 @@ package net.runelite.client.plugins.barbarianassault;
 import java.awt.Color;
 import java.util.ArrayList;
 
+import java.util.List;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.events.ChatMessage;
@@ -41,7 +42,7 @@ public class Scorecard
 	private BarbarianAssaultPlugin game;
 
 	@Getter(AccessLevel.NONE)
-	private ArrayList<Wave> waves = new ArrayList<>();
+	private List<Wave> waves = new ArrayList<>();
 	private String[] totalDescriptions = {
 		"A: ",
 		"; D: ",