diff --git a/src/main/java/forge/game/zone/MagicStack.java b/src/main/java/forge/game/zone/MagicStack.java
index e3ac0fec896..0df46b808a2 100644
--- a/src/main/java/forge/game/zone/MagicStack.java
+++ b/src/main/java/forge/game/zone/MagicStack.java
@@ -844,7 +844,6 @@ public class MagicStack extends MyObservable implements Iterable<SpellAbilitySta
     public final SpellAbility peekAbility() {
         return this.stack.peekFirst().getSpellAbility();
     }
-    }
 
     /**
      * <p>
diff --git a/src/main/java/forge/gui/match/views/VStack.java b/src/main/java/forge/gui/match/views/VStack.java
index 9bdad212ee6..10fa5c5c6e7 100644
--- a/src/main/java/forge/gui/match/views/VStack.java
+++ b/src/main/java/forge/gui/match/views/VStack.java
@@ -136,8 +136,7 @@ public enum VStack implements IVDoc<CStack> {
 
         stackTARs.clear();
         boolean isFirst = true;
-        for (int i = 0;i<stack.size();i++) {
-            final SpellAbilityStackInstance spell = stack.getStack().get(i);
+        for (final SpellAbilityStackInstance spell : stack) {
             scheme = getSpellColor(spell);
 
             String isOptional = spell.getSpellAbility().isOptionalTrigger() && spell.getSourceCard().getController().equals(viewer) ? "(OPTIONAL) " : "";