diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java b/src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java
index c247f22967c..9b6f158dc86 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java
@@ -65,17 +65,18 @@ public class AbilityFactorySacrifice {
      */
     public static SpellAbility createAbilitySacrifice(final AbilityFactory af) {
         class AbilitySacrifice extends AbilityActivated {
-            public AbilitySacrifice(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilitySacrifice(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilitySacrifice(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilitySacrifice(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -1933592438783630254L;
 
             @Override
@@ -99,7 +100,7 @@ public class AbilityFactorySacrifice {
             }
         }
         final SpellAbility abSacrifice = new AbilitySacrifice(af.getHostCard(), af.getAbCost(), af.getAbTgt());
-        
+
         return abSacrifice;
     }
 
@@ -145,17 +146,18 @@ public class AbilityFactorySacrifice {
      */
     public static SpellAbility createDrawbackSacrifice(final AbilityFactory af) {
         class DrawbackSacrifice extends AbilitySub {
-            public DrawbackSacrifice(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackSacrifice(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackSacrifice(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackSacrifice(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -5141246507533353605L;
 
             @Override
@@ -179,7 +181,7 @@ public class AbilityFactorySacrifice {
             }
         }
         final SpellAbility dbSacrifice = new DrawbackSacrifice(af.getHostCard(), af.getAbTgt());
-        
+
         return dbSacrifice;
     }
 
@@ -637,17 +639,18 @@ public class AbilityFactorySacrifice {
      */
     public static SpellAbility createAbilitySacrificeAll(final AbilityFactory af) {
         class AbilitySacrificeAll extends AbilityActivated {
-            public AbilitySacrificeAll(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilitySacrificeAll(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilitySacrificeAll(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilitySacrificeAll(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -1933592438783630254L;
 
             @Override
@@ -671,7 +674,7 @@ public class AbilityFactorySacrifice {
             }
         }
         final SpellAbility abSacrifice = new AbilitySacrificeAll(af.getHostCard(), af.getAbCost(), af.getAbTgt());
-        
+
         return abSacrifice;
     }
 
@@ -719,17 +722,18 @@ public class AbilityFactorySacrifice {
      */
     public static SpellAbility createDrawbackSacrificeAll(final AbilityFactory af) {
         class DrawbackSacrificeAll extends AbilitySub {
-            public DrawbackSacrificeAll(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackSacrificeAll(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackSacrificeAll(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackSacrificeAll(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -5141246507533353605L;
 
             @Override
@@ -753,7 +757,7 @@ public class AbilityFactorySacrifice {
             }
         }
         final SpellAbility dbSacrifice = new DrawbackSacrificeAll(af.getHostCard(), af.getAbTgt());
-        
+
         return dbSacrifice;
     }
 
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactorySetState.java b/src/main/java/forge/card/abilityfactory/AbilityFactorySetState.java
index 4626f8a868b..4d3d044f0e2 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactorySetState.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactorySetState.java
@@ -51,17 +51,18 @@ public class AbilityFactorySetState {
      */
     public static SpellAbility getSetStateAbility(final AbilityFactory abilityFactory) {
         class AbilitySetState extends AbilityActivated {
-            public AbilitySetState(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilitySetState(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilitySetState(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilitySetState(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -1083427558368639457L;
 
             @Override
@@ -133,17 +134,18 @@ public class AbilityFactorySetState {
      */
     public static SpellAbility getSetStateDrawback(final AbilityFactory abilityFactory) {
         class DrawbackSetState extends AbilitySub {
-            public DrawbackSetState(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackSetState(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackSetState(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackSetState(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -3793247725721587468L;
 
             @Override
@@ -179,7 +181,7 @@ public class AbilityFactorySetState {
 
         }
         final AbilitySub ret = new DrawbackSetState(abilityFactory.getHostCard(), abilityFactory.getAbTgt());
-        
+
         return ret;
     }
 
@@ -325,17 +327,18 @@ public class AbilityFactorySetState {
      */
     public static SpellAbility getSetStateAllAbility(final AbilityFactory abilityFactory) {
         class AbilitySetStateAll extends AbilityActivated {
-            public AbilitySetStateAll(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilitySetStateAll(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilitySetStateAll(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilitySetStateAll(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = 7841029107610111992L;
 
             @Override
@@ -349,7 +352,7 @@ public class AbilityFactorySetState {
             }
         }
         final SpellAbility ret = new AbilitySetStateAll(abilityFactory.getHostCard(), abilityFactory.getAbCost(),
-                abilityFactory.getAbTgt()) ;
+                abilityFactory.getAbTgt());
 
         return ret;
     }
@@ -389,17 +392,18 @@ public class AbilityFactorySetState {
      */
     public static SpellAbility getSetStateAllDrawback(final AbilityFactory abilityFactory) {
         class DrawbackSetStateAll extends AbilitySub {
-            public DrawbackSetStateAll(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackSetStateAll(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackSetStateAll(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackSetStateAll(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = 4047514893482113436L;
 
             @Override
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryStoreSVar.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryStoreSVar.java
index 7ec253485f1..c1af6f3ebeb 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryStoreSVar.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryStoreSVar.java
@@ -49,17 +49,18 @@ public class AbilityFactoryStoreSVar {
      */
     public static SpellAbility createAbilityStoreSVar(final AbilityFactory abilityFactory) {
         class AbilityStoreSVar extends AbilityActivated {
-            public AbilityStoreSVar(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilityStoreSVar(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilityStoreSVar(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilityStoreSVar(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -7299561150243337080L;
             private final AbilityFactory af = abilityFactory;
 
@@ -136,17 +137,18 @@ public class AbilityFactoryStoreSVar {
      */
     public static SpellAbility createDrawbackStoreSVar(final AbilityFactory abilityFactory) {
         class DrawbackStoreSVar extends AbilitySub {
-            public DrawbackStoreSVar(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackStoreSVar(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackStoreSVar(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackStoreSVar(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = 6631124959690157874L;
 
             private final AbilityFactory af = abilityFactory;
@@ -185,7 +187,7 @@ public class AbilityFactoryStoreSVar {
             }
         }
         final SpellAbility dbStoreSVar = new DrawbackStoreSVar(abilityFactory.getHostCard(), abilityFactory.getAbTgt());
-        
+
         return dbStoreSVar;
     }
 
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java
index 4ebeda7a30a..04603e31adb 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java
@@ -153,17 +153,18 @@ public class AbilityFactoryToken extends AbilityFactory {
      */
     public final SpellAbility getAbility() {
         class AbilityToken extends AbilityActivated {
-            public AbilityToken(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilityToken(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilityToken(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilityToken(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = 8460074843405764620L;
 
             @Override
@@ -240,17 +241,18 @@ public class AbilityFactoryToken extends AbilityFactory {
      */
     public final SpellAbility getDrawback() {
         class DrawbackToken extends AbilitySub {
-            public DrawbackToken(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackToken(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackToken(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackToken(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = 7239608350643325111L;
 
             @Override
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryTurns.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryTurns.java
index bdbf9f281a6..f87563536d8 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryTurns.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryTurns.java
@@ -60,17 +60,18 @@ public class AbilityFactoryTurns {
      */
     public static SpellAbility createAbilityAddTurn(final AbilityFactory af) {
         class AbilityAddTurn extends AbilityActivated {
-            public AbilityAddTurn(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilityAddTurn(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilityAddTurn(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilityAddTurn(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -3526200766738015688L;
 
             @Override
@@ -94,7 +95,7 @@ public class AbilityFactoryTurns {
             }
         }
         final SpellAbility abAddTurn = new AbilityAddTurn(af.getHostCard(), af.getAbCost(), af.getAbTgt());
-        
+
         return abAddTurn;
     }
 
@@ -149,17 +150,18 @@ public class AbilityFactoryTurns {
      */
     public static SpellAbility createDrawbackAddTurn(final AbilityFactory af) {
         class DrawbackAddTurn extends AbilitySub {
-            public DrawbackAddTurn(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackAddTurn(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackAddTurn(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackAddTurn(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -562517287448810951L;
 
             @Override
@@ -183,7 +185,7 @@ public class AbilityFactoryTurns {
             }
         }
         final SpellAbility dbAddTurn = new DrawbackAddTurn(af.getHostCard(), af.getAbTgt());
-        
+
         return dbAddTurn;
     }
 
@@ -369,17 +371,18 @@ public class AbilityFactoryTurns {
      */
     public static SpellAbility createAbilityEndTurn(final AbilityFactory af) {
         class AbilityEndTurn extends AbilityActivated {
-            public AbilityEndTurn(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilityEndTurn(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilityEndTurn(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilityEndTurn(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = 72570867940224012L;
 
             @Override
@@ -450,17 +453,18 @@ public class AbilityFactoryTurns {
      */
     public static SpellAbility createDrawbackEndTurn(final AbilityFactory af) {
         class DrawbackEndTurn extends AbilitySub {
-            public DrawbackEndTurn(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackEndTurn(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackEndTurn(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackEndTurn(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -562517287448810951L;
 
             @Override
@@ -488,7 +492,7 @@ public class AbilityFactoryTurns {
             }
         }
         final SpellAbility dbEndTurn = new DrawbackEndTurn(af.getHostCard(), af.getAbTgt());
-        
+
         return dbEndTurn;
     }
 
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
index 8b0ea11e62d..9323bb230f0 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
@@ -1,5 +1,5 @@
 /*
- 
+
 * Forge: Play Magic: the Gathering.
  * Copyright (C) 2011  Forge Team
  *
@@ -69,17 +69,18 @@ public class AbilityFactoryZoneAffecting {
      */
     public static SpellAbility createAbilityDraw(final AbilityFactory af) {
         class AbilityDraw extends AbilityActivated {
-            public AbilityDraw(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilityDraw(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilityDraw(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilityDraw(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = 5445572699000471299L;
 
             @Override
@@ -103,7 +104,7 @@ public class AbilityFactoryZoneAffecting {
             }
         }
         final SpellAbility abDraw = new AbilityDraw(af.getHostCard(), af.getAbCost(), af.getAbTgt());
-        
+
         return abDraw;
     }
 
@@ -158,17 +159,18 @@ public class AbilityFactoryZoneAffecting {
      */
     public static SpellAbility createDrawbackDraw(final AbilityFactory af) {
         class DrawbackDraw extends AbilitySub {
-            public DrawbackDraw(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackDraw(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackDraw(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackDraw(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -4990932993654533449L;
 
             @Override
@@ -197,7 +199,7 @@ public class AbilityFactoryZoneAffecting {
             }
         }
         final SpellAbility dbDraw = new DrawbackDraw(af.getHostCard(), af.getAbTgt());
-        
+
         return dbDraw;
     }
 
@@ -629,17 +631,18 @@ public class AbilityFactoryZoneAffecting {
      */
     public static SpellAbility createAbilityMill(final AbilityFactory af) {
         class AbilityMill extends AbilityActivated {
-            public AbilityMill(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilityMill(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilityMill(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilityMill(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = 5445572699000471299L;
 
             @Override
@@ -663,7 +666,7 @@ public class AbilityFactoryZoneAffecting {
             }
         }
         final SpellAbility abMill = new AbilityMill(af.getHostCard(), af.getAbCost(), af.getAbTgt());
-        
+
         return abMill;
     }
 
@@ -710,17 +713,18 @@ public class AbilityFactoryZoneAffecting {
      */
     public static SpellAbility createDrawbackMill(final AbilityFactory af) {
         class DrawbackMill extends AbilitySub {
-            public DrawbackMill(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackMill(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackMill(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackMill(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -4990932993654533449L;
 
             @Override
@@ -744,7 +748,7 @@ public class AbilityFactoryZoneAffecting {
             }
         }
         final SpellAbility dbMill = new DrawbackMill(af.getHostCard(), af.getAbTgt());
-        
+
         return dbMill;
     }
 
@@ -1086,17 +1090,18 @@ public class AbilityFactoryZoneAffecting {
      */
     public static SpellAbility createAbilityDiscard(final AbilityFactory af) {
         class AbilityDiscard extends AbilityActivated {
-            public AbilityDiscard(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilityDiscard(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilityDiscard(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilityDiscard(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = 4348585353456736817L;
 
             @Override
@@ -1121,7 +1126,7 @@ public class AbilityFactoryZoneAffecting {
         }
 
         final SpellAbility abDiscard = new AbilityDiscard(af.getHostCard(), af.getAbCost(), af.getAbTgt());
-        
+
         return abDiscard;
     }
 
@@ -1176,17 +1181,18 @@ public class AbilityFactoryZoneAffecting {
      */
     public static SpellAbility createDrawbackDiscard(final AbilityFactory af) {
         class DrawbackDiscard extends AbilitySub {
-            public DrawbackDiscard(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackDiscard(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackDiscard(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackDiscard(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = 4348585353456736817L;
 
             @Override
@@ -1215,7 +1221,7 @@ public class AbilityFactoryZoneAffecting {
             }
         }
         final SpellAbility dbDiscard = new DrawbackDiscard(af.getHostCard(), af.getAbTgt());
-        
+
         return dbDiscard;
     }
 
@@ -1719,17 +1725,18 @@ public class AbilityFactoryZoneAffecting {
      */
     public static SpellAbility createAbilityShuffle(final AbilityFactory af) {
         class AbilityShuffle extends AbilityActivated {
-            public AbilityShuffle(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilityShuffle(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilityShuffle(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilityShuffle(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -1245185178904838198L;
 
             @Override
@@ -1753,7 +1760,7 @@ public class AbilityFactoryZoneAffecting {
             }
         }
         final SpellAbility abShuffle = new AbilityShuffle(af.getHostCard(), af.getAbCost(), af.getAbTgt());
-        
+
         return abShuffle;
     }
 
@@ -1800,17 +1807,18 @@ public class AbilityFactoryZoneAffecting {
      */
     public static SpellAbility createDrawbackShuffle(final AbilityFactory af) {
         class DrawbackShuffle extends AbilitySub {
-            public DrawbackShuffle(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackShuffle(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackShuffle(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackShuffle(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = 5974307947494280639L;
 
             @Override
@@ -1834,7 +1842,7 @@ public class AbilityFactoryZoneAffecting {
             }
         }
         final SpellAbility dbShuffle = new DrawbackShuffle(af.getHostCard(), af.getAbTgt());
-        
+
         return dbShuffle;
     }