diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java
index 29fdaea89a..23890a8cea 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java
@@ -56,13 +56,13 @@ import net.runelite.http.api.ws.messages.LoginResponse;
 public class AccountPlugin extends Plugin
 {
 	@Inject
-	SessionManager sessionManager;
+	private SessionManager sessionManager;
 
 	@Inject
-	ClientUI ui;
+	private ClientUI ui;
 
 	@Inject
-	ScheduledExecutorService executor;
+	private ScheduledExecutorService executor;
 
 	private NavigationButton loginButton;
 	private NavigationButton logoutButton;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorPlugin.java
index 7e2acce9ba..c45edfd325 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorPlugin.java
@@ -65,13 +65,13 @@ public class AttackIndicatorPlugin extends Plugin
 	private final Table<WeaponType, WidgetInfo, Boolean> widgetsToHide = HashBasedTable.create();
 
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	AttackIndicatorConfig config;
+	private AttackIndicatorConfig config;
 
 	@Inject
-	AttackIndicatorOverlay overlay;
+	private AttackIndicatorOverlay overlay;
 
 	@Override
 	public void configure(Binder binder)
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 ffe351c0ac..8e672d547e 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
@@ -65,13 +65,13 @@ public class BarbarianAssaultPlugin extends Plugin
 	private int inGameBit = 0;
 
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	BarbarianAssaultConfig config;
+	private BarbarianAssaultConfig config;
 
 	@Inject
-	BarbarianAssaultOverlay overlay;
+	private BarbarianAssaultOverlay overlay;
 
 	@Provides
 	BarbarianAssaultConfig provideConfig(ConfigManager configManager)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java
index 6280180c2f..ac544830c8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java
@@ -55,13 +55,13 @@ public class BoostsPlugin extends Plugin
 	};
 
 	@Inject
-	InfoBoxManager infoBoxManager;
+	private InfoBoxManager infoBoxManager;
 
 	@Inject
-	BoostsOverlay boostsOverlay;
+	private BoostsOverlay boostsOverlay;
 
 	@Inject
-	BoostsConfig config;
+	private BoostsConfig config;
 
 	@Getter
 	private Skill[] shownSkills;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java
index 13b87b5cf7..d463f6f733 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java
@@ -41,7 +41,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
 public class BossTimersPlugin extends Plugin
 {
 	@Inject
-	InfoBoxManager infoBoxManager;
+	private InfoBoxManager infoBoxManager;
 
 	@Override
 	protected void shutDown() throws Exception
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java
index 3a6a3ee250..0e47efb2fc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java
@@ -64,13 +64,13 @@ public class CannonPlugin extends Plugin
 	net.runelite.api.Point myCannon;
 
 	@Inject
-	Notifier notifier;
+	private Notifier notifier;
 
 	@Inject
-	CannonOverlay cannonOverlay;
+	private CannonOverlay cannonOverlay;
 
 	@Inject
-	CannonConfig config;
+	private CannonConfig config;
 
 	@Inject
 	private Client client;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
index f73ea9ceaa..e4e6608b91 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
@@ -68,19 +68,19 @@ public class ChatCommandsPlugin extends Plugin
 	private final HiscoreClient hiscoreClient = new HiscoreClient();
 
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	ChatCommandsConfig config;
+	private ChatCommandsConfig config;
 
 	@Inject
-	ItemManager itemManager;
+	private ItemManager itemManager;
 
 	@Inject
-	ChatMessageManager chatMessageManager;
+	private ChatMessageManager chatMessageManager;
 
 	@Inject
-	ScheduledExecutorService executor;
+	private ScheduledExecutorService executor;
 
 	@Provides
 	ChatCommandsConfig provideConfig(ConfigManager configManager)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
index 3f35768861..779ed39960 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
@@ -76,10 +76,10 @@ public class ClanChatPlugin extends Plugin
 	private int modIconsLength;
 
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	ClanChatConfig config;
+	private ClanChatConfig config;
 
 	@Provides
 	ClanChatConfig provideConfig(ConfigManager configManager)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
index b864e635e5..04a4965c34 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
@@ -46,13 +46,13 @@ import net.runelite.client.task.Schedule;
 public class ClueScrollPlugin extends Plugin
 {
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	ClueScrollConfig config;
+	private ClueScrollConfig config;
 
 	@Inject
-	ClueScrollOverlay clueScrollOverlay;
+	private ClueScrollOverlay clueScrollOverlay;
 
 	@Override
 	public void configure(Binder binder)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
index e5f0c7f8ee..02d3210c56 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
@@ -42,10 +42,10 @@ import net.runelite.client.ui.NavigationButton;
 public class ConfigPlugin extends Plugin
 {
 	@Inject
-	ClientUI ui;
+	private ClientUI ui;
 
 	@Inject
-	ConfigManager configManager;
+	private ConfigManager configManager;
 
 	private ConfigPanel configPanel;
 	private NavigationButton navButton;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java
index 15c31e2469..f83b62fce5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java
@@ -43,10 +43,10 @@ import net.runelite.client.ui.overlay.Overlay;
 public class DevToolsPlugin extends Plugin
 {
 	@Inject
-	ClientUI ui;
+	private ClientUI ui;
 
 	@Inject
-	DevToolsOverlay overlay;
+	private DevToolsOverlay overlay;
 
 	private boolean togglePlayers;
 	private boolean toggleNpcs;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/diaryprogress/DiaryProgressPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/diaryprogress/DiaryProgressPlugin.java
index 8f23f66c65..b10f8b1783 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/diaryprogress/DiaryProgressPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/diaryprogress/DiaryProgressPlugin.java
@@ -45,10 +45,10 @@ public class DiaryProgressPlugin extends Plugin
 	private static final String STAGE_UNFINISHED_STRING = "<col=ffff00>_</col>";
 
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	DiaryProgressConfig config;
+	private DiaryProgressConfig config;
 
 	@Provides
 	DiaryProgressConfig provideConfig(ConfigManager configManager)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
index 011d7a97cf..813692fb80 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
@@ -79,19 +79,19 @@ public class ExaminePlugin extends Plugin
 		.build();
 
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	ExamineConfig config;
+	private ExamineConfig config;
 
 	@Inject
-	ItemManager itemManager;
+	private ItemManager itemManager;
 
 	@Inject
-	ChatMessageManager chatMessageManager;
+	private ChatMessageManager chatMessageManager;
 
 	@Inject
-	ScheduledExecutorService executor;
+	private ScheduledExecutorService executor;
 
 	@Provides
 	ExamineConfig provideConfig(ConfigManager configManager)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/ExperienceDropPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/ExperienceDropPlugin.java
index 70385e910d..9b1ddd2152 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/ExperienceDropPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/ExperienceDropPlugin.java
@@ -43,10 +43,10 @@ import net.runelite.client.plugins.PluginDescriptor;
 public class ExperienceDropPlugin extends Plugin
 {
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	ExperienceDropConfig config;
+	private ExperienceDropConfig config;
 
 	@Provides
 	ExperienceDropConfig provideConfig(ConfigManager configManager)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java
index 7894751caf..ca3a0b3d82 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java
@@ -46,16 +46,16 @@ import net.runelite.client.util.QueryRunner;
 public class FightCavePlugin extends Plugin
 {
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	QueryRunner queryRunner;
+	private QueryRunner queryRunner;
 
 	@Inject
-	FightCaveConfig config;
+	private FightCaveConfig config;
 
 	@Inject
-	FightCaveOverlay overlay;
+	private FightCaveOverlay overlay;
 
 	private JadAttack attack;
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
index 68a7c8cf14..a89d46b9ba 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
@@ -50,13 +50,13 @@ import net.runelite.client.ui.overlay.Overlay;
 public class FishingPlugin extends Plugin
 {
 	@Inject
-	FishingConfig config;
+	private FishingConfig config;
 
 	@Inject
-	FishingOverlay overlay;
+	private FishingOverlay overlay;
 
 	@Inject
-	FishingSpotOverlay spotOverlay;
+	private FishingSpotOverlay spotOverlay;
 
 	private final FishingSession session = new FishingSession();
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java
index 2613d1ff03..dcf104c4dc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java
@@ -86,7 +86,7 @@ public class GroundItemsOverlay extends Overlay
 	private final StringBuilder itemStringBuilder = new StringBuilder();
 
 	@Inject
-	ItemManager itemManager;
+	private ItemManager itemManager;
 
 	@Inject
 	public GroundItemsOverlay(@Nullable Client client, GroundItemsConfig config)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
index 01b68d1016..49db6827cb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
@@ -38,10 +38,10 @@ import net.runelite.client.ui.overlay.Overlay;
 public class GroundItemsPlugin extends Plugin
 {
 	@Inject
-	ConfigManager configManager;
+	private ConfigManager configManager;
 
 	@Inject
-	GroundItemsOverlay overlay;
+	private GroundItemsOverlay overlay;
 
 	@Override
 	public void configure(Binder binder)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java
index 7a5c77dcdd..52e29fff3e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java
@@ -46,13 +46,13 @@ public class HiscorePlugin extends Plugin
 	private static final String LOOKUP = "Lookup";
 
 	@Inject
-	ClientUI ui;
+	private ClientUI ui;
 
 	@Inject
-	MenuManager menuManager;
+	private MenuManager menuManager;
 
 	@Inject
-	ScheduledExecutorService executor;
+	private ScheduledExecutorService executor;
 
 	private NavigationButton navButton;
 	private HiscorePanel hiscorePanel;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java
index 26c0a66274..fccb8135ee 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java
@@ -118,16 +118,16 @@ public class IdleNotifierPlugin extends Plugin
 	private static final Duration SIX_HOUR_LOGOUT_WARNING_AFTER_DURATION = Duration.ofMinutes(340);
 
 	@Inject
-	Notifier notifier;
+	private Notifier notifier;
 
 	@Inject
-	ClientUI gui;
+	private ClientUI gui;
 
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	IdleNotifierConfig config;
+	private IdleNotifierConfig config;
 
 	private Actor lastOpponent;
 	private Instant lastAnimating;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java
index 25fe919cd0..1590dac18c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java
@@ -44,7 +44,7 @@ import net.runelite.client.ui.overlay.Overlay;
 public class ImplingsPlugin extends Plugin
 {
 	@Inject
-	ImplingsOverlay overlay;
+	private ImplingsOverlay overlay;
 
 	@Override
 	public void configure(Binder binder)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java
index 09b6d5d3de..f9875aa162 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java
@@ -51,13 +51,13 @@ public class InstanceMapPlugin extends Plugin
 	private final WidgetMenuOption descendOption = new WidgetMenuOption("Descend", "Instance Map", WidgetInfo.WORLD_MAP);
 
 	@Inject
-	InstanceMapConfig config;
+	private InstanceMapConfig config;
 
 	@Inject
-	InstanceMapOverlay overlay;
+	private InstanceMapOverlay overlay;
 
 	@Inject
-	MenuManager menuManager;
+	private MenuManager menuManager;
 
 	@Override
 	public void configure(Binder binder)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCountPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCountPlugin.java
index 5b6ab44f5c..2f2aee9058 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCountPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCountPlugin.java
@@ -38,10 +38,10 @@ import net.runelite.client.ui.overlay.Overlay;
 public class JewelleryCountPlugin extends Plugin
 {
 	@Inject
-	JewelleryCountConfig config;
+	private JewelleryCountConfig config;
 
 	@Inject
-	JewelleryCountOverlay overlay;
+	private JewelleryCountOverlay overlay;
 
 	@Override
 	public void configure(Binder binder)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java
index 95709b5cd9..56a79c1794 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java
@@ -41,10 +41,10 @@ import net.runelite.client.plugins.PluginDescriptor;
 public class LowMemoryPlugin extends Plugin
 {
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	LowMemoryConfig config;
+	private LowMemoryConfig config;
 
 	@Provides
 	LowMemoryConfig provideConfig(ConfigManager configManager)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java
index 013cf595fa..e8beccf6b4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java
@@ -41,10 +41,10 @@ import net.runelite.client.plugins.PluginDescriptor;
 public class MetronomePlugin extends Plugin
 {
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	MetronomePluginConfiguration config;
+	private MetronomePluginConfiguration config;
 
 	private int tickCounter = 0;
 	private boolean shouldTock = false;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java
index 7997108ff2..2ef1291442 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java
@@ -77,16 +77,16 @@ public class MotherlodePlugin extends Plugin
 	private BufferedImage mineIcon;
 
 	@Inject
-	MotherlodeOverlay overlay;
+	private MotherlodeOverlay overlay;
 
 	@Inject
-	MotherlodeRocksOverlay rocksOverlay;
+	private MotherlodeRocksOverlay rocksOverlay;
 
 	@Inject
-	MotherlodeSackOverlay motherlodeSackOverlay;
+	private MotherlodeSackOverlay motherlodeSackOverlay;
 
 	@Inject
-	MotherlodeConfig config;
+	private MotherlodeConfig config;
 
 	private final MotherlodeSession session = new MotherlodeSession();
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java
index 3658da11f7..697cadef26 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java
@@ -38,10 +38,10 @@ import net.runelite.client.ui.overlay.Overlay;
 public class MouseHighlightPlugin extends Plugin
 {
 	@Inject
-	MouseHighlightConfig config;
+	private MouseHighlightConfig config;
 
 	@Inject
-	MouseHighlightOverlay overlay;
+	private MouseHighlightOverlay overlay;
 
 	@Override
 	public void configure(Binder binder)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java
index ca479410ca..efdbd48bec 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java
@@ -44,7 +44,7 @@ import net.runelite.client.ui.overlay.Overlay;
 public class OpponentInfoPlugin extends Plugin
 {
 	@Inject
-	OpponentInfoOverlay overlay;
+	private OpponentInfoOverlay overlay;
 
 	@Override
 	public void configure(Binder binder)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java
index 4be3ecb58f..1880ca018f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java
@@ -40,7 +40,7 @@ public class PestControlPlugin extends Plugin
 	private Font font;
 
 	@Inject
-	PestControlOverlay overlay;
+	private PestControlOverlay overlay;
 
 	@Override
 	public void configure(Binder binder)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java
index b2e2e4352a..6de65bbc53 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java
@@ -38,10 +38,10 @@ import net.runelite.client.ui.overlay.Overlay;
 public class PlayerIndicatorsPlugin extends Plugin
 {
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	PlayerIndicatorsConfig config;
+	private PlayerIndicatorsConfig config;
 
 	PlayerIndicatorsOverlay playerIndicatorsOverlay;
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayflick/PrayerFlickPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayflick/PrayerFlickPlugin.java
index 7c6cc157da..4bea1a4643 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayflick/PrayerFlickPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayflick/PrayerFlickPlugin.java
@@ -40,7 +40,7 @@ import net.runelite.client.ui.overlay.Overlay;
 public class PrayerFlickPlugin extends Plugin
 {
 	@Inject
-	PrayerFlickOverlay overlay;
+	private PrayerFlickOverlay overlay;
 
 	@Override
 	public void configure(Binder binder)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/rememberusername/RememberUsernamePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/rememberusername/RememberUsernamePlugin.java
index 8e5c05a693..617944ccda 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/rememberusername/RememberUsernamePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/rememberusername/RememberUsernamePlugin.java
@@ -40,10 +40,10 @@ import net.runelite.client.plugins.PluginDescriptor;
 public class RememberUsernamePlugin extends Plugin
 {
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	RememberUsernameConfig config;
+	private RememberUsernameConfig config;
 
 	@Provides
 	RememberUsernameConfig getConfig(ConfigManager configManager)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java
index 8658dc212b..66934743cb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java
@@ -60,10 +60,10 @@ public class ReportButtonPlugin extends Plugin
 	private boolean ready;
 
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	ReportButtonConfig config;
+	private ReportButtonConfig config;
 
 	@Provides
 	ReportButtonConfig provideConfig(ConfigManager configManager)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java
index 20b3a0d96d..23a1216bf9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java
@@ -38,10 +38,10 @@ import net.runelite.client.ui.overlay.Overlay;
 public class RunepouchPlugin extends Plugin
 {
 	@Inject
-	ConfigManager configManager;
+	private ConfigManager configManager;
 
 	@Inject
-	RunepouchOverlay overlay;
+	private RunepouchOverlay overlay;
 
 	@Override
 	public void configure(Binder binder)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
index 8365eebaa0..fe95cd304c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
@@ -108,19 +108,19 @@ public class ScreenshotPlugin extends Plugin
 	private Integer barrowsNumber;
 
 	@Inject
-	ScreenshotConfig config;
+	private ScreenshotConfig config;
 
 	@Inject
-	Notifier notifier;
+	private Notifier notifier;
 
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	ClientUI clientUi;
+	private ClientUI clientUi;
 
 	@Inject
-	OverlayRenderer overlayRenderer;
+	private OverlayRenderer overlayRenderer;
 
 	private JButton titleBarButton;
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
index 49ac588d21..69c0597b70 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
@@ -74,19 +74,19 @@ public class SlayerPlugin extends Plugin
 	private static final Pattern REWARD_POINTS = Pattern.compile("Reward points: (\\d*)");
 
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	SlayerConfig config;
+	private SlayerConfig config;
 
 	@Inject
-	SlayerOverlay overlay;
+	private SlayerOverlay overlay;
 
 	@Inject
-	InfoBoxManager infoBoxManager;
+	private InfoBoxManager infoBoxManager;
 
 	@Inject
-	ItemManager itemManager;
+	private ItemManager itemManager;
 
 	private String taskName;
 	private int amount;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specorb/SpecOrbPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/specorb/SpecOrbPlugin.java
index 773893029c..e9f1047315 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/specorb/SpecOrbPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/specorb/SpecOrbPlugin.java
@@ -47,7 +47,7 @@ public class SpecOrbPlugin extends Plugin
 	private Image specialAttackIcon;
 
 	@Inject
-	SpecOrbOverlay overlay;
+	private SpecOrbOverlay overlay;
 
 	@Override
 	public void configure(Binder binder)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java
index 632cc25211..57b0482f7d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java
@@ -49,13 +49,13 @@ import net.runelite.client.ui.overlay.Overlay;
 public class TeamCapesPlugin extends Plugin
 {
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	TeamCapesConfig config;
+	private TeamCapesConfig config;
 
 	@Inject
-	TeamCapesOverlay teamCapesOverlay;
+	private TeamCapesOverlay teamCapesOverlay;
 
 	private Map<Integer, Integer> teams = new HashMap<>();
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java
index 5d7412fc99..33ee115aaf 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java
@@ -38,10 +38,10 @@ import net.runelite.client.ui.overlay.Overlay;
 public class TileIndicatorsPlugin extends Plugin
 {
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	TileIndicatorsConfig config;
+	private TileIndicatorsConfig config;
 
 	private TileIndicatorsOverlay tileIndicatorsOverlay;
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
index e136d32843..a2055e767e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
@@ -80,13 +80,13 @@ public class TimersPlugin extends Plugin
 	private int lastRaidVarb;
 
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	TimersConfig config;
+	private TimersConfig config;
 
 	@Inject
-	InfoBoxManager infoBoxManager;
+	private InfoBoxManager infoBoxManager;
 
 	@Provides
 	TimersConfig getConfig(ConfigManager configManager)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java
index d196cf5cd3..6ed607a99a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java
@@ -46,13 +46,13 @@ import net.runelite.client.ui.overlay.Overlay;
 public class WoodcuttingPlugin extends Plugin
 {
 	@Inject
-	Notifier notifier;
+	private Notifier notifier;
 
 	@Inject
-	WoodcuttingOverlay overlay;
+	private WoodcuttingOverlay overlay;
 
 	@Inject
-	WoodcuttingConfig config;
+	private WoodcuttingConfig config;
 
 	private final WoodcuttingSession session = new WoodcuttingSession();
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java
index 1c53c1e531..312450eed2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java
@@ -54,13 +54,13 @@ public class XpGlobesPlugin extends Plugin
 	private final List<XpGlobe> xpGlobes = new ArrayList<>();
 
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	XpGlobesConfig config;
+	private XpGlobesConfig config;
 
 	@Inject
-	XpGlobesOverlay overlay;
+	private XpGlobesOverlay overlay;
 
 	@Override
 	public void configure(Binder binder)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
index a2844c7d58..73d22b20a2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
@@ -56,10 +56,10 @@ import net.runelite.http.api.xp.XpClient;
 public class XpTrackerPlugin extends Plugin
 {
 	@Inject
-	ClientUI ui;
+	private ClientUI ui;
 
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
 	ScheduledExecutorService executor;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java
index c1d017c61e..cea0707076 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java
@@ -49,10 +49,10 @@ public class XteaPlugin extends Plugin
 	private final Set<Integer> sentRegions = new HashSet<>();
 
 	@Inject
-	Client client;
+	private Client client;
 
 	@Inject
-	ScheduledExecutorService executor;
+	private ScheduledExecutorService executor;
 
 	@Subscribe
 	public void onMapRegionChanged(MapRegionChanged event)