diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityArenaTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityArenaTimer.java
index f0f9d97291..740852ef92 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityArenaTimer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityArenaTimer.java
@@ -33,9 +33,9 @@ import net.runelite.client.plugins.Plugin;
 import net.runelite.client.ui.overlay.infobox.Timer;
 
 @Slf4j
-public class AgilityArenaTimer extends Timer
+class AgilityArenaTimer extends Timer
 {
-	public AgilityArenaTimer(Plugin plugin)
+	AgilityArenaTimer(Plugin plugin)
 	{
 		super(1, ChronoUnit.MINUTES, getTicketImage(), plugin);
 		setTooltip("Time left until location changes");
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java
index eee6582efc..1c9ca737c6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java
@@ -40,7 +40,7 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
-public class AgilityOverlay extends Overlay
+class AgilityOverlay extends Overlay
 {
 	private static final int MAX_DISTANCE = 2350;
 
@@ -49,7 +49,7 @@ public class AgilityOverlay extends Overlay
 	private final AgilityConfig config;
 
 	@Inject
-	public AgilityOverlay(Client client, AgilityPlugin plugin, AgilityConfig config)
+	private AgilityOverlay(Client client, AgilityPlugin plugin, AgilityConfig config)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java
index e17d86666a..a8ba2937ca 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java
@@ -33,19 +33,19 @@ import net.runelite.api.Skill;
 
 @Getter
 @Setter
-public class AgilitySession
+class AgilitySession
 {
 	private final Courses course;
 	private Instant lastLapCompleted;
 	private int totalLaps;
 	private int lapsTillLevel;
 
-	public AgilitySession(Courses course)
+	AgilitySession(Courses course)
 	{
 		this.course = course;
 	}
 
-	public void incrementLapCount(Client client)
+	void incrementLapCount(Client client)
 	{
 		lastLapCompleted = Instant.now();
 		++totalLaps;
@@ -63,7 +63,7 @@ public class AgilitySession
 		lapsTillLevel = remainingXp > 0 ? (int) Math.ceil(remainingXp / course.getTotalXp()) : 0;
 	}
 
-	public void resetLapCount()
+	void resetLapCount()
 	{
 		totalLaps = 0;
 		lapsTillLevel = 0;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Courses.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Courses.java
index 4184549de5..f02a1066e1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Courses.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Courses.java
@@ -29,7 +29,7 @@ import java.util.Map;
 import lombok.Getter;
 import net.runelite.api.coords.WorldPoint;
 
-public enum Courses
+enum Courses
 {
 	GNOME(86.5, 46, 9781),
 	DRAYNOR(120.0, 79, 12338),
@@ -77,7 +77,7 @@ public enum Courses
 		this.courseEndWorldPoints = courseEndWorldPoints;
 	}
 
-	public static Courses getCourse(int regionId)
+	static Courses getCourse(int regionId)
 	{
 		return coursesByRegion.get(regionId);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java
index ad707b685d..fb096960cc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java
@@ -35,7 +35,7 @@ import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.components.LineComponent;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 
-public class LapCounterOverlay extends Overlay
+class LapCounterOverlay extends Overlay
 {
 	private final AgilityPlugin plugin;
 	private final AgilityConfig config;
@@ -43,7 +43,7 @@ public class LapCounterOverlay extends Overlay
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	LapCounterOverlay(AgilityPlugin plugin, AgilityConfig config)
+	private LapCounterOverlay(AgilityPlugin plugin, AgilityConfig config)
 	{
 		setPosition(OverlayPosition.TOP_LEFT);
 		setPriority(OverlayPriority.LOW);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java
index dfcd1deed8..3d075facdc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java
@@ -31,9 +31,9 @@ import java.util.Set;
 import static net.runelite.api.ObjectID.*;
 import static net.runelite.api.NullObjectID.*;
 
-public class Obstacles
+class Obstacles
 {
-	public static final Set<Integer> COURSE_OBSTACLE_IDS = ImmutableSet.of(
+	static final Set<Integer> COURSE_OBSTACLE_IDS = ImmutableSet.of(
 		// Gnome
 		OBSTACLE_NET_23134, TREE_BRANCH_23559, TREE_BRANCH_23560, OBSTACLE_NET_23135, OBSTACLE_PIPE_23138,
 		OBSTACLE_PIPE_23139, LOG_BALANCE_23145, BALANCING_ROPE_23557,
@@ -79,7 +79,7 @@ public class Obstacles
 		GAP_11406, GAP_11429, GAP_11430, STEEP_ROOF, GAP_11630, PLANK_11631, WOODEN_BEAMS
 	);
 
-	public static final Set<Integer> SHORTCUT_OBSTACLE_IDS = ImmutableSet.of(
+	static final Set<Integer> SHORTCUT_OBSTACLE_IDS = ImmutableSet.of(
 		// Grand Exchange
 		UNDERWALL_TUNNEL_16529, UNDERWALL_TUNNEL_16530,
 		// South Varrock
@@ -192,10 +192,10 @@ public class Obstacles
 		CLIMBING_ROCKS_11948, CLIMBING_ROCKS_11949
 	);
 
-	public static final Set<Integer> TRAP_OBSTACLE_IDS = ImmutableSet.of(
+	static final Set<Integer> TRAP_OBSTACLE_IDS = ImmutableSet.of(
 		// Agility pyramid
 		NULL_3550, NULL_10872, NULL_10873
 	);
 
-	public static final List<Integer> TRAP_OBSTACLE_REGIONS = ImmutableList.of(12105, 13356);
+	static final List<Integer> TRAP_OBSTACLE_REGIONS = ImmutableList.of(12105, 13356);
 }