diff --git a/Mage.Sets/src/mage/sets/darkascension/Vorapede.java b/Mage.Sets/src/mage/sets/darkascension/Vorapede.java
index 904df94564..afcb3155fc 100644
--- a/Mage.Sets/src/mage/sets/darkascension/Vorapede.java
+++ b/Mage.Sets/src/mage/sets/darkascension/Vorapede.java
@@ -31,9 +31,9 @@ import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
+import mage.abilities.keyword.TrampleAbility;
 import mage.abilities.keyword.UndyingAbility;
 import mage.abilities.keyword.VigilanceAbility;
-import mage.abilities.keyword.TrampleAbility;
 import mage.cards.CardImpl;
 
 /**
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MazesEnd.java b/Mage.Sets/src/mage/sets/dragonsmaze/MazesEnd.java
index 771b6efb54..ffd99ede8a 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/MazesEnd.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/MazesEnd.java
@@ -75,7 +75,7 @@ public class MazesEnd extends CardImpl<MazesEnd> {
         // {T}: Add 1 to your mana pool.
         this.addAbility(new ColorlessManaAbility());
 
-        // 3, {T}, Return Maze's End to your hand: Search your library for a Gate card, put it onto the battlefield, then shuffle your library. If you control ten or more Gates with different names, you win the game.
+        // 3, {T}, Return Maze's End  to its owner’s hand: Search your library for a Gate card, put it onto the battlefield, then shuffle your library. If you control ten or more Gates with different names, you win the game.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filterCard)), new GenericManaCost(3));
         ability.addEffect(new MazesEndEffect());
         ability.addCost(new TapSourceCost());
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/UnwindingClock.java b/Mage.Sets/src/mage/sets/newphyrexia/UnwindingClock.java
index c7e3846292..3cd5f5631e 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/UnwindingClock.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/UnwindingClock.java
@@ -90,8 +90,9 @@ class UnwindingClockEffect extends ContinuousEffectImpl<UnwindingClockEffect> {
     @Override
     public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
         Boolean applied = (Boolean) game.getState().getValue(source.getSourceId() + "applied");
-        if (applied == null)
+        if (applied == null) {
             applied = Boolean.FALSE;
+        }
         if (!applied && layer.equals(Layer.RulesEffects)) {
             if (!game.getActivePlayerId().equals(source.getControllerId()) && game.getStep().getType() == PhaseStep.UNTAP) {
                 game.getState().setValue(source.getSourceId() + "applied", true);
@@ -100,7 +101,9 @@ class UnwindingClockEffect extends ContinuousEffectImpl<UnwindingClockEffect> {
                     for (RestrictionEffect effect: game.getContinuousEffects().getApplicableRestrictionEffects(artifact, game).keySet()) {
                         untap &= effect.canBeUntapped(artifact, game);
                     }
-                    if (untap) artifact.untap(game);
+                    if (untap) {
+                        artifact.untap(game);
+                    }
                 }
             }
         } else if (applied && layer.equals(Layer.RulesEffects)) {
diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheTendedGarden.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheTendedGarden.java
index de7cd35ed0..9fdcd92e8e 100644
--- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheTendedGarden.java
+++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KamiOfTheTendedGarden.java
@@ -28,7 +28,6 @@
 package mage.sets.saviorsofkamigawa;
 
 import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -52,6 +51,7 @@ public class KamiOfTheTendedGarden extends CardImpl<KamiOfTheTendedGarden> {
         this.color.setGreen(true);
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
+
         // At the beginning of your upkeep, sacrifice Kami of the Tended Garden unless you pay {G}.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ColoredManaCost(Constants.ColoredManaSymbol.G)), Constants.TargetController.YOU, false));
         this.addAbility(new SoulshiftAbility(3));
diff --git a/Mage/src/mage/game/turn/EndPhase.java b/Mage/src/mage/game/turn/EndPhase.java
index f33905b347..ef079e49fd 100644
--- a/Mage/src/mage/game/turn/EndPhase.java
+++ b/Mage/src/mage/game/turn/EndPhase.java
@@ -61,8 +61,9 @@ public class EndPhase extends Phase<EndPhase> {
             }
             currentStep.endStep(game, activePlayerId);
         }
-        else
+        else {
             super.playStep(game);
+        }
     }
 
     @Override