diff --git a/src/main/java/com/volmit/iris/command/CommandIrisDownload.java b/src/main/java/com/volmit/iris/command/CommandIrisDownload.java
index 61e81408b..797e03a2a 100644
--- a/src/main/java/com/volmit/iris/command/CommandIrisDownload.java
+++ b/src/main/java/com/volmit/iris/command/CommandIrisDownload.java
@@ -36,9 +36,9 @@ public class CommandIrisDownload extends MortarCommand
 
 		for(String i : args)
 		{
-			if(i.equals("-t") || i.equals("--trim"))
-			{
+			if (i.equals("-t") || i.equals("--trim")) {
 				trim = true;
+				break;
 			}
 		}
 
diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java b/src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java
index 0ea74fa14..0c0465436 100644
--- a/src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java
+++ b/src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java
@@ -48,10 +48,10 @@ public class CommandIrisObjectPaste extends MortarCommand
 
 		for(String i : args)
 		{
-			if(i.equalsIgnoreCase("-edit"))
-			{
-				intoWand = true;
-			}
+            if (i.equalsIgnoreCase("-edit")) {
+                intoWand = true;
+                break;
+            }
 		}
 
 		if(file == null || !file.exists())
diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectSave.java b/src/main/java/com/volmit/iris/command/CommandIrisObjectSave.java
index ba081da3a..bb6ad9e59 100644
--- a/src/main/java/com/volmit/iris/command/CommandIrisObjectSave.java
+++ b/src/main/java/com/volmit/iris/command/CommandIrisObjectSave.java
@@ -51,10 +51,10 @@ public class CommandIrisObjectSave extends MortarCommand
 
 			for(String i : args)
 			{
-				if(i.equals("-o"))
-				{
-					overwrite = true;
-				}
+                if (i.equals("-o")) {
+                    overwrite = true;
+                    break;
+                }
 			}
 
 			Player p = sender.player();
diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStructureCreate.java b/src/main/java/com/volmit/iris/command/CommandIrisStructureCreate.java
index 181edf2a2..a9ec56e6f 100644
--- a/src/main/java/com/volmit/iris/command/CommandIrisStructureCreate.java
+++ b/src/main/java/com/volmit/iris/command/CommandIrisStructureCreate.java
@@ -39,10 +39,10 @@ public class CommandIrisStructureCreate extends MortarCommand
 
 		for(String i : args)
 		{
-			if(i.equalsIgnoreCase("-3d"))
-			{
-				d3 = true;
-			}
+            if (i.equalsIgnoreCase("-3d")) {
+                d3 = true;
+                break;
+            }
 		}
 
 		sender.sendMessage("Creating new Structure");
diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioGoto.java b/src/main/java/com/volmit/iris/command/CommandIrisStudioGoto.java
index 9db62d193..0ec7c9bf8 100644
--- a/src/main/java/com/volmit/iris/command/CommandIrisStudioGoto.java
+++ b/src/main/java/com/volmit/iris/command/CommandIrisStudioGoto.java
@@ -74,10 +74,10 @@ public class CommandIrisStudioGoto extends MortarCommand
 
 			for(String i : args)
 			{
-				if(i.equalsIgnoreCase("-cave"))
-				{
-					cave = true;
-				}
+                if (i.equalsIgnoreCase("-cave")) {
+                    cave = true;
+                    break;
+                }
 			}
 
 			IrisBiome biome = args[0].equals("this") ? g.sampleTrueBiome(p.getLocation().getBlockX(), p.getLocation().getBlockZ()) : g.loadBiome(args[0]);
diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioPackage.java b/src/main/java/com/volmit/iris/command/CommandIrisStudioPackage.java
index 95dc6d7ca..8efece1d0 100644
--- a/src/main/java/com/volmit/iris/command/CommandIrisStudioPackage.java
+++ b/src/main/java/com/volmit/iris/command/CommandIrisStudioPackage.java
@@ -38,10 +38,10 @@ public class CommandIrisStudioPackage extends MortarCommand
 
 			for(String i : args)
 			{
-				if(i.equalsIgnoreCase("-o"))
-				{
-					o = true;
-				}
+                if (i.equalsIgnoreCase("-o")) {
+                    o = true;
+                    break;
+                }
 			}
 
 			String dim = args[0];