diff --git a/src/main/java/forge/ComputerUtil.java b/src/main/java/forge/ComputerUtil.java
index e7e32011962..014ae15a47c 100644
--- a/src/main/java/forge/ComputerUtil.java
+++ b/src/main/java/forge/ComputerUtil.java
@@ -1537,7 +1537,7 @@ public class ComputerUtil {
 
         for (int i = 0; i < max; i++) {
             Card c = null;
-            
+
             if (destroy) {
                 CardList indestructibles = list.getKeyword("Indestructible");
                 if (!indestructibles.isEmpty()) {
@@ -1551,9 +1551,9 @@ public class ComputerUtil {
                 } else {
                     c = CardFactoryUtil.getWorstPermanentAI(list, true, true, true, true);
                 }
-    
+
                 final ArrayList<Card> auras = c.getEnchantedBy();
-    
+
                 if (auras.size() > 0) {
                     // TODO: choose "worst" controlled enchanting Aura
                     for (int j = 0; j < auras.size(); j++) {
@@ -1565,11 +1565,11 @@ public class ComputerUtil {
                     }
                 }
                 if (destroy) {
-                    if(!AllZone.getGameAction().destroy(c)) {
+                    if (!AllZone.getGameAction().destroy(c)) {
                         continue;
                     }
                 } else {
-                    if(!AllZone.getGameAction().sacrifice(c)) {
+                    if (!AllZone.getGameAction().sacrifice(c)) {
                         continue;
                     }
                 }
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java b/src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java
index f2890eaaea0..45b37a5aee1 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java
@@ -554,7 +554,7 @@ public class AbilityFactorySacrifice {
             o = GuiUtils.getChoice("Select a card to sacrifice", list.toArray());
             if (o != null) {
                 final Card c = (Card) o;
-                
+
                 if (destroy) {
                     if (!AllZone.getGameAction().destroy(c)) {
                         continue;
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
index 728d0825827..e96486af5e1 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
@@ -3763,10 +3763,11 @@ public class CardFactoryUtil {
         // does?
         for (int i = 0; i < multiplier; i++) {
             Card temp = CardFactoryUtil.copyStats(c);
-            
+
             for (final String kw : intrinsicKeywords) {
                 if (kw.startsWith("HIDDEN")) {
-                    temp.addExtrinsicKeyword(kw);//extrinsic keywords won't survive the copyStats treatment 
+                    temp.addExtrinsicKeyword(kw);
+                    //extrinsic keywords won't survive the copyStats treatment
                 } else {
                     temp.addIntrinsicKeyword(kw);
                 }
diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java
index 41922b664be..df301818fd0 100644
--- a/src/main/java/forge/card/trigger/TriggerHandler.java
+++ b/src/main/java/forge/card/trigger/TriggerHandler.java
@@ -1007,7 +1007,7 @@ public class TriggerHandler {
                                     regtrig.getHostCard().getName()));
                             buildQuestion.append(")\r\n");
                             if (sa[0].getTriggeringObjects().containsKey("Attacker")) {
-                                buildQuestion.append("[Attacker: " +sa[0].getTriggeringObjects().get("Attacker") + "]");
+                                buildQuestion.append("[Attacker: " + sa[0].getTriggeringObjects().get("Attacker") + "]");
                             }
                             if (!GameActionUtil.showYesNoDialog(regtrig.getHostCard(), buildQuestion.toString())) {
                                 return;
diff --git a/src/main/java/forge/deck/generate/Generate2ColorDeck.java b/src/main/java/forge/deck/generate/Generate2ColorDeck.java
index 861ec506b23..dfadc89af4b 100644
--- a/src/main/java/forge/deck/generate/Generate2ColorDeck.java
+++ b/src/main/java/forge/deck/generate/Generate2ColorDeck.java
@@ -191,8 +191,8 @@ public class Generate2ColorDeck {
 
         // select cards to build card pools using a mana curve
         for (int i = 4; i > 0; i--) {
-            
-            if (i==1) {
+
+            if (i == 1) {
                 maxCMC[0] = 20; //the last category is open ended
                 i = 0; // this reduces the number of cards in the last category to 4
             }
@@ -201,7 +201,7 @@ public class Generate2ColorDeck {
             final CardList sp1CMC = sp1.filter(cmcF);
             final CardList sp2CMC = sp2.filter(cmcF);
 
-            for (int j = 0; j < i+1; j++) {
+            for (int j = 0; j < i + 1; j++) {
                 Card c = cr1CMC.get(this.r.nextInt(cr1CMC.size()));
                 cr12.add(c);
                 this.cardCounts.put(c.getName(), 0);
diff --git a/src/main/java/forge/deck/generate/Generate3ColorDeck.java b/src/main/java/forge/deck/generate/Generate3ColorDeck.java
index 6b944255cd1..857f2d062c0 100644
--- a/src/main/java/forge/deck/generate/Generate3ColorDeck.java
+++ b/src/main/java/forge/deck/generate/Generate3ColorDeck.java
@@ -207,7 +207,7 @@ public class Generate3ColorDeck {
 
         // select cards to build card pools using a mana curve
         for (int i = 3; i > 0; i--) {
-            if (i==1) {
+            if (i == 1) {
                 maxCMC[0] = 20; //the last category is open ended
                 i = 0; // this reduces the number of cards in the last category to 6
             }
@@ -219,7 +219,7 @@ public class Generate3ColorDeck {
             final CardList sp2CMC = sp2.filter(cmcF);
             final CardList sp3CMC = sp3.filter(cmcF);
 
-            for (int j = 0; j < i+1; j++) {
+            for (int j = 0; j < i + 1; j++) {
                 Card c = cr1CMC.get(this.r.nextInt(cr1CMC.size()));
                 cr123.add(c);
                 this.cardCounts.put(c.getName(), 0);
diff --git a/src/main/java/forge/deck/generate/Generate5ColorDeck.java b/src/main/java/forge/deck/generate/Generate5ColorDeck.java
index 0e821dc9ee6..d6d24f43379 100644
--- a/src/main/java/forge/deck/generate/Generate5ColorDeck.java
+++ b/src/main/java/forge/deck/generate/Generate5ColorDeck.java
@@ -213,7 +213,7 @@ public class Generate5ColorDeck {
 
         // select cards to build card pools using a mana curve
         for (int i = 3; i > 0; i--) {
-            if (i==1) {
+            if (i == 1) {
                 maxCMC[0] = 20; //the last category is open ended
             }
             final CardList cr1CMC = cr1.filter(cmcF);