diff --git a/forge-ai/src/main/java/forge/ai/AiAttackController.java b/forge-ai/src/main/java/forge/ai/AiAttackController.java
index a0dd1b7bbbc..cbebf5990d8 100644
--- a/forge-ai/src/main/java/forge/ai/AiAttackController.java
+++ b/forge-ai/src/main/java/forge/ai/AiAttackController.java
@@ -208,7 +208,6 @@ public class AiAttackController {
      * @return a boolean.
      */
     public final boolean isEffectiveAttacker(final Player ai, final Card attacker, final Combat combat) {
-
         // if the attacker will die when attacking don't attack
         if ((attacker.getNetToughness() + ComputerUtilCombat.predictToughnessBonusOfAttacker(attacker, null, combat, true)) <= 0) {
             return false;
diff --git a/forge-core/src/main/java/forge/CardStorageReader.java b/forge-core/src/main/java/forge/CardStorageReader.java
index 3f6c89288df..12184eecf60 100644
--- a/forge-core/src/main/java/forge/CardStorageReader.java
+++ b/forge-core/src/main/java/forge/CardStorageReader.java
@@ -310,7 +310,7 @@ public class CardStorageReader {
 
     private void executeLoadTask(final Collection<CardRules> result, final List<Callable<List<CardRules>>> tasks, final CountDownLatch cdl) {
         try {
-            if ( useThreadPool ) {
+            if (useThreadPool) {
                 final ExecutorService executor = ThreadUtil.getComputingPool(0.5f);
                 final List<Future<List<CardRules>>> parts = executor.invokeAll(tasks);
                 executor.shutdown();
diff --git a/forge-core/src/main/java/forge/card/CardRules.java b/forge-core/src/main/java/forge/card/CardRules.java
index 174229fe0c0..ff8b6dd08fc 100644
--- a/forge-core/src/main/java/forge/card/CardRules.java
+++ b/forge-core/src/main/java/forge/card/CardRules.java
@@ -423,7 +423,7 @@ public final class CardRules implements ICardCharacteristics {
                         String variable = colonPos > 0 ? value.substring(0, colonPos) : value;
                         value = colonPos > 0 ? value.substring(1+colonPos) : null;
 
-                        if ( "RemoveDeck".equals(variable) ) {
+                        if ("RemoveDeck".equals(variable)) {
                             this.removedFromAIDecks |= "All".equalsIgnoreCase(value);
                             this.removedFromRandomDecks |= "Random".equalsIgnoreCase(value);
                             this.removedFromNonCommanderDecks |= "NonCommander".equalsIgnoreCase(value);
diff --git a/forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java
index 92652afa881..9b72db247ed 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java
@@ -17,7 +17,7 @@ public class RepeatEffect extends SpellAbilityEffect {
     @Override
     protected String getStackDescription(final SpellAbility sa) {
         return "Repeat something. Somebody should really write a better StackDescription!";
-    } // end repeatStackDescription()
+    }
 
     @Override
     public void resolve(final SpellAbility sa) {
diff --git a/forge-gui/res/cardsfolder/f/first_response.txt b/forge-gui/res/cardsfolder/f/first_response.txt
index 92ed33c8ec9..cfdedce96d5 100644
--- a/forge-gui/res/cardsfolder/f/first_response.txt
+++ b/forge-gui/res/cardsfolder/f/first_response.txt
@@ -3,6 +3,6 @@ ManaCost:3 W
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | CheckSVar$ X | SVarCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of each upkeep, if you lost life last turn, create a 1/1 white Soldier creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_soldier | TokenOwner$ You | LegacyImage$ w 1 1 soldier m15
-SVar:X:Count$Controller$LifeLostLastTurn
+SVar:X:PlayerCountPropertyYou$LifeLostLastTurn
 SVar:Picture:http://www.wizards.com/global/images/magic/general/first_response.jpg
 Oracle:At the beginning of each upkeep, if you lost life last turn, create a 1/1 white Soldier creature token.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/p/paladin_of_atonement.txt b/forge-gui/res/cardsfolder/p/paladin_of_atonement.txt
index c026ed41c79..d53113eadaf 100644
--- a/forge-gui/res/cardsfolder/p/paladin_of_atonement.txt
+++ b/forge-gui/res/cardsfolder/p/paladin_of_atonement.txt
@@ -6,7 +6,7 @@ T:Mode$ Phase | Phase$ Upkeep | CheckSVar$ X | SVarCompare$ GE1 | TriggerZones$
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you gain life equal to its toughness.
 SVar:TrigGainLife:DB$GainLife | Defined$ TriggeredCardController | LifeAmount$ Y
-SVar:X:Count$Controller$LifeLostLastTurn
+SVar:X:PlayerCountPropertyYou$LifeLostLastTurn
 SVar:Y:TriggeredCard$CardToughness
 SVar:Picture:http://www.wizards.com/global/images/magic/general/paladin_of_atonement.jpg
 Oracle:At the beginning of each upkeep, if you lost life last turn, put a +1/+1 counter on Paladin of Atonement.\nWhen Paladin of Atonement dies, you gain life equal to its toughness.
\ No newline at end of file