diff --git a/src/main/java/forge/PlayerZoneComesIntoPlay.java b/src/main/java/forge/PlayerZoneComesIntoPlay.java
index 3981e031c95..1c304a9f283 100644
--- a/src/main/java/forge/PlayerZoneComesIntoPlay.java
+++ b/src/main/java/forge/PlayerZoneComesIntoPlay.java
@@ -134,7 +134,7 @@ public class PlayerZoneComesIntoPlay extends DefaultPlayerZone {
                         } else {
                             toAdd = Integer.parseInt(numCounters);
                         }
-    
+
                         c.addCounter(counter, toAdd);
                     }
                 }
diff --git a/src/main/java/forge/card/BoosterGenerator.java b/src/main/java/forge/card/BoosterGenerator.java
index 7833462e725..46a10dc68eb 100644
--- a/src/main/java/forge/card/BoosterGenerator.java
+++ b/src/main/java/forge/card/BoosterGenerator.java
@@ -71,7 +71,7 @@ public class BoosterGenerator {
         }
     }
 
-    private void MergeAllFacedCards() {
+    private void mergeAllFacedCards() {
         for (CardRarity v : CardRarity.values()) {
             List<CardPrinted> cp = new ArrayList<CardPrinted>(singleFacedByRarity.get(v));
             cp.addAll(twoFacedByRarity.get(v));
@@ -92,7 +92,7 @@ public class BoosterGenerator {
         for (final CardPrinted c : cards) {
             this.addToRarity(c);
         }
-        MergeAllFacedCards();
+        mergeAllFacedCards();
     }
 
     /**
@@ -106,7 +106,7 @@ public class BoosterGenerator {
         for (final Entry<CardPrinted, Integer> e : dPool) {
             this.addToRarity(e.getKey());
         }
-        MergeAllFacedCards();
+        mergeAllFacedCards();
     }
 
     /**
@@ -124,7 +124,7 @@ public class BoosterGenerator {
             this.addToRarity(c);
             // System.out.println(c);
         }
-        MergeAllFacedCards();
+        mergeAllFacedCards();
         // System.out.println("done");
     }
 
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java
index 7698836f05e..19141871cfd 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java
@@ -311,8 +311,8 @@ public class AbilityFactoryAttach {
         final Card attachSource = sa.getSourceCard();
         // TODO AttachSource is currently set for the Source of the Spell, but
         // at some point can support attaching a different card
-        
-        // Don't equip if already equipping 
+
+        // Don't equip if already equipping
         if (attachSource.getEquippingCard() != null && attachSource.getEquippingCard().getController().isComputer()) {
             return null;
         }
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java
index 13bfc8671af..01dc4c6941c 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java
@@ -366,7 +366,7 @@ public class AbilityFactoryEffect {
         if (params.containsKey("StaticAbilities")) {
             effectStaticAbilities = params.get("StaticAbilities").split(",");
         }
-        
+
         if (params.containsKey("ReplacementEffects")) {
             effectReplacementEffects = params.get("ReplacementEffects").split(",");
         }
@@ -441,12 +441,12 @@ public class AbilityFactoryEffect {
                 eff.addStaticAbility(af.getHostCard().getSVar(s));
             }
         }
-        
+
         // Grant replacement effects
         if (effectReplacementEffects != null) {
             for (final String s : effectReplacementEffects) {
                 final String actualReplacement = af.getHostCard().getSVar(s);
-                
+
                 final ReplacementEffect parsedReplacement = ReplacementHandler.parseReplacement(actualReplacement, eff);
                 eff.addReplacementEffect(parsedReplacement);
             }