diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryDelayedTrigger.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDelayedTrigger.java
index 3f6876556bd..4f0d5eda913 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryDelayedTrigger.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryDelayedTrigger.java
@@ -54,17 +54,18 @@ public class AbilityFactoryDelayedTrigger {
      */
     public static SpellAbility getAbility(final AbilityFactory af) {
         class AbilityDelayedTrigger extends AbilityActivated {
-            public AbilityDelayedTrigger(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilityDelayedTrigger(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilityDelayedTrigger(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilityDelayedTrigger(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -7502962478028160305L;
 
             @Override
@@ -88,7 +89,7 @@ public class AbilityFactoryDelayedTrigger {
             }
         }
         final SpellAbility ability = new AbilityDelayedTrigger(af.getHostCard(), af.getAbCost(), af.getAbTgt());
-        
+
         return ability;
     }
 
@@ -135,17 +136,18 @@ public class AbilityFactoryDelayedTrigger {
      */
     public static AbilitySub getDrawback(final AbilityFactory abilityFactory) {
         class DrawbackDelayedTrigger extends AbilitySub {
-            public DrawbackDelayedTrigger(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackDelayedTrigger(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackDelayedTrigger(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackDelayedTrigger(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = 6192972525033429820L;
 
             @Override
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java
index e0a117902a1..c8dbc15b9a2 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java
@@ -68,17 +68,18 @@ public class AbilityFactoryDestroy {
      */
     public static SpellAbility createAbilityDestroy(final AbilityFactory af) {
         class AbilityDestroy extends AbilityActivated {
-            public AbilityDestroy(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilityDestroy(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilityDestroy(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilityDestroy(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -4153613567150919283L;
 
             @Override
@@ -102,7 +103,7 @@ public class AbilityFactoryDestroy {
             }
         }
         final SpellAbility abDestroy = new AbilityDestroy(af.getHostCard(), af.getAbCost(), af.getAbTgt());
-        
+
         return abDestroy;
     }
 
@@ -157,17 +158,18 @@ public class AbilityFactoryDestroy {
      */
     public static AbilitySub createDrawbackDestroy(final AbilityFactory af) {
         class DrawbackDestroy extends AbilitySub {
-            public DrawbackDestroy(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackDestroy(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackDestroy(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackDestroy(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -4153613567150919283L;
 
             @Override
@@ -191,7 +193,7 @@ public class AbilityFactoryDestroy {
             }
         }
         final AbilitySub dbDestroy = new DrawbackDestroy(af.getHostCard(), af.getAbTgt());
-        
+
         return dbDestroy;
     }
 
@@ -623,17 +625,18 @@ public class AbilityFactoryDestroy {
      */
     public static SpellAbility createAbilityDestroyAll(final AbilityFactory af) {
         class AbilityDestroyAll extends AbilityActivated {
-            public AbilityDestroyAll(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilityDestroyAll(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilityDestroyAll(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilityDestroyAll(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -1376444173137861437L;
 
             private final HashMap<String, String> params = af.getMapParams();
@@ -660,7 +663,7 @@ public class AbilityFactoryDestroy {
             }
         }
         final SpellAbility abDestroyAll = new AbilityDestroyAll(af.getHostCard(), af.getAbCost(), af.getAbTgt());
-        
+
         return abDestroyAll;
     }
 
@@ -714,17 +717,18 @@ public class AbilityFactoryDestroy {
      */
     public static SpellAbility createDrawbackDestroyAll(final AbilityFactory af) {
         class DrawbackDestroyAll extends AbilitySub {
-            public DrawbackDestroyAll(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackDestroyAll(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackDestroyAll(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackDestroyAll(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -242160421677518351L;
 
             private final HashMap<String, String> params = af.getMapParams();
@@ -756,7 +760,7 @@ public class AbilityFactoryDestroy {
             }
         }
         final SpellAbility dbDestroyAll = new DrawbackDestroyAll(af.getHostCard(), af.getAbTgt());
-        
+
         return dbDestroyAll;
     }
 
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java
index 49dfd77d557..1f72f7047c8 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java
@@ -68,17 +68,18 @@ public class AbilityFactoryEffect {
      */
     public static SpellAbility createAbilityEffect(final AbilityFactory abilityFactory) {
         class AbilityEffect extends AbilityActivated {
-            public AbilityEffect(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilityEffect(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilityEffect(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilityEffect(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = 8869422603616247307L;
 
             private final AbilityFactory af = abilityFactory;
@@ -107,7 +108,7 @@ public class AbilityFactoryEffect {
         }
         final SpellAbility abEffect = new AbilityEffect(abilityFactory.getHostCard(), abilityFactory.getAbCost(),
                 abilityFactory.getAbTgt());
-        
+
         return abEffect;
     }
 
@@ -159,17 +160,18 @@ public class AbilityFactoryEffect {
      */
     public static SpellAbility createDrawbackEffect(final AbilityFactory abilityFactory) {
         class DrawbackEffect extends AbilitySub {
-            public DrawbackEffect(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackEffect(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackEffect(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackEffect(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = 6631124959690157874L;
 
             private final AbilityFactory af = abilityFactory;
@@ -202,7 +204,7 @@ public class AbilityFactoryEffect {
             }
         }
         final SpellAbility dbEffect = new DrawbackEffect(abilityFactory.getHostCard(), abilityFactory.getAbTgt());
-        
+
         return dbEffect;
     }
 
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryEndGameCondition.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryEndGameCondition.java
index 149064da179..596415576ac 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryEndGameCondition.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryEndGameCondition.java
@@ -61,17 +61,18 @@ public final class AbilityFactoryEndGameCondition {
      */
     public static SpellAbility createAbilityWinsGame(final AbilityFactory af) {
         class AbilityWinsGame extends AbilityActivated {
-            public AbilityWinsGame(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilityWinsGame(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilityWinsGame(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilityWinsGame(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = 8869422603616247307L;
 
             @Override
@@ -97,7 +98,7 @@ public final class AbilityFactoryEndGameCondition {
             }
         }
         final SpellAbility abWinsGame = new AbilityWinsGame(af.getHostCard(), af.getAbCost(), af.getAbTgt());
-        
+
         return abWinsGame;
     }
 
@@ -151,17 +152,18 @@ public final class AbilityFactoryEndGameCondition {
      */
     public static SpellAbility createDrawbackWinsGame(final AbilityFactory af) {
         class DrawbackWinsGame extends AbilitySub {
-            public DrawbackWinsGame(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackWinsGame(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackWinsGame(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackWinsGame(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = 6631124959690157874L;
 
             @Override
@@ -197,7 +199,7 @@ public final class AbilityFactoryEndGameCondition {
             }
         }
         final SpellAbility dbWinsGame = new DrawbackWinsGame(af.getHostCard(), af.getAbTgt());
-        
+
         return dbWinsGame;
     }
 
@@ -323,17 +325,18 @@ public final class AbilityFactoryEndGameCondition {
      */
     public static SpellAbility createAbilityLosesGame(final AbilityFactory af) {
         class AbilityLosesGame extends AbilityActivated {
-            public AbilityLosesGame(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilityLosesGame(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilityLosesGame(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilityLosesGame(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = 8869422603616247307L;
 
             @Override
@@ -359,7 +362,7 @@ public final class AbilityFactoryEndGameCondition {
             }
         }
         final SpellAbility abLosesGame = new AbilityLosesGame(af.getHostCard(), af.getAbCost(), af.getAbTgt());
-        
+
         return abLosesGame;
     }
 
@@ -413,17 +416,18 @@ public final class AbilityFactoryEndGameCondition {
      */
     public static SpellAbility createDrawbackLosesGame(final AbilityFactory af) {
         class DrawbackLosesGame extends AbilitySub {
-            public DrawbackLosesGame(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackLosesGame(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackLosesGame(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackLosesGame(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = 6631124959690157874L;
 
             @Override
@@ -459,7 +463,7 @@ public final class AbilityFactoryEndGameCondition {
             }
         }
         final SpellAbility dbLosesGame = new DrawbackLosesGame(af.getHostCard(), af.getAbTgt());
-        
+
         return dbLosesGame;
     }
 
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryGainControl.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryGainControl.java
index 80b08d10b1d..9902a258214 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryGainControl.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryGainControl.java
@@ -151,17 +151,18 @@ public class AbilityFactoryGainControl {
      */
     public final SpellAbility getAbilityGainControl() {
         class AbilityGainControl extends AbilityActivated {
-            public AbilityGainControl(final Card ca,final Cost co,final Target t) {
-                super(ca,co,t);
+            public AbilityGainControl(final Card ca, final Cost co, final Target t) {
+                super(ca, co, t);
             }
-            
+
             @Override
             public AbilityActivated getCopy() {
-                AbilityActivated res = new AbilityGainControl(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget()));
+                AbilityActivated res = new AbilityGainControl(getSourceCard(),
+                        getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
                 CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -4384705198674678831L;
 
             @Override
@@ -199,17 +200,18 @@ public class AbilityFactoryGainControl {
      */
     public final SpellAbility getDrawbackGainControl() {
         class DrawbackGainControl extends AbilitySub {
-            public DrawbackGainControl(final Card ca,final Target t) {
-                super(ca,t);
+            public DrawbackGainControl(final Card ca, final Target t) {
+                super(ca, t);
             }
-            
+
             @Override
             public AbilitySub getCopy() {
-                AbilitySub res = new DrawbackGainControl(getSourceCard(),getTarget() == null ? null : new Target(getTarget()));
-                CardFactoryUtil.copySpellAbility(this,res);
+                AbilitySub res = new DrawbackGainControl(getSourceCard(),
+                        getTarget() == null ? null : new Target(getTarget()));
+                CardFactoryUtil.copySpellAbility(this, res);
                 return res;
             }
-            
+
             private static final long serialVersionUID = -5577742598032345880L;
 
             @Override