diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java
index 76f095df..9e13597c 100644
--- a/src/main/java/net/wurstclient/WurstClient.java
+++ b/src/main/java/net/wurstclient/WurstClient.java
@@ -36,6 +36,7 @@ import net.wurstclient.update.WurstUpdater;
 public enum WurstClient
 {
 	INSTANCE;
+	
 	public static final MinecraftClient MC = MinecraftClient.getInstance();
 	public static final IMinecraftClient IMC = (IMinecraftClient)MC;
 	
diff --git a/src/main/java/net/wurstclient/mixin/BlockStateMixin.java b/src/main/java/net/wurstclient/mixin/BlockStateMixin.java
index 740b9f26..5422a554 100644
--- a/src/main/java/net/wurstclient/mixin/BlockStateMixin.java
+++ b/src/main/java/net/wurstclient/mixin/BlockStateMixin.java
@@ -26,8 +26,7 @@ import net.wurstclient.events.GetAmbientOcclusionLightLevelListener.GetAmbientOc
 import net.wurstclient.events.IsNormalCubeListener.IsNormalCubeEvent;
 
 @Mixin(BlockState.class)
-public class BlockStateMixin
-	extends AbstractState<Block, BlockState>
+public class BlockStateMixin extends AbstractState<Block, BlockState>
 	implements State<BlockState>
 {
 	private BlockStateMixin(WurstClient wurst, Block object_1,
diff --git a/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java
index 07b4cc72..485e0de4 100644
--- a/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java
+++ b/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java
@@ -165,12 +165,9 @@ public final class NavigatorFeatureScreen extends NavigatorScreen
 					possibleKeybind.getDescription());
 			TreeMap<String, PossibleKeybind> existingKeybinds = new TreeMap<>();
 			boolean noKeybindsSet = true;
-			for(int i = 0; i < WurstClient.INSTANCE.getKeybinds()
-				.getAllKeybinds().size(); i++)
+			for(Keybind keybind : WurstClient.INSTANCE.getKeybinds()
+				.getAllKeybinds())
 			{
-				Keybind keybind =
-					WurstClient.INSTANCE.getKeybinds().getAllKeybinds().get(i);
-				
 				String commands = keybind.getCommands();
 				commands = commands.replace(";", "\u00a7")
 					.replace("\u00a7\u00a7", ";");
@@ -469,10 +466,8 @@ public final class NavigatorFeatureScreen extends NavigatorScreen
 		GL11.glPopMatrix();
 		
 		// buttons below scissor box
-		for(int i = 0; i < buttons.size(); i++)
+		for(AbstractButtonWidget button : buttons)
 		{
-			AbstractButtonWidget button = buttons.get(i);
-			
 			// positions
 			int x1 = button.x;
 			int x2 = x1 + button.getWidth();
diff --git a/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java
index 7c3033e4..6553b812 100644
--- a/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java
+++ b/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java
@@ -208,9 +208,9 @@ public class NavigatorNewKeybindScreen extends NavigatorScreen
 		glDisable(GL_SCISSOR_TEST);
 		
 		// buttons below scissor box
-		for(int i = 0; i < buttons.size(); i++)
+		for(AbstractButtonWidget button2 : buttons)
 		{
-			AbstractButtonWidget button = buttons.get(i);
+			AbstractButtonWidget button = button2;
 			
 			// positions
 			int x1 = button.x;
diff --git a/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java
index a226af5a..f39b5a51 100644
--- a/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java
+++ b/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java
@@ -185,9 +185,9 @@ public class NavigatorRemoveKeybindScreen extends NavigatorScreen
 		glDisable(GL_SCISSOR_TEST);
 		
 		// buttons below scissor box
-		for(int i = 0; i < buttons.size(); i++)
+		for(AbstractButtonWidget button2 : buttons)
 		{
-			AbstractButtonWidget button = buttons.get(i);
+			AbstractButtonWidget button = button2;
 			
 			// positions
 			int x1 = button.x;