diff --git a/Mage.Sets/src/mage/cards/b/BoarUmbra.java b/Mage.Sets/src/mage/cards/b/BoarUmbra.java
index c161a7a1ca..5e40bb1e6a 100644
--- a/Mage.Sets/src/mage/cards/b/BoarUmbra.java
+++ b/Mage.Sets/src/mage/cards/b/BoarUmbra.java
@@ -31,8 +31,11 @@ public final class BoarUmbra extends CardImpl {
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
+
         // Enchanted creature gets +3/+3.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield)));
+
+        // Totem armor
         this.addAbility(new TotemArmorAbility());
     }
 
diff --git a/Mage.Sets/src/mage/cards/c/CrabUmbra.java b/Mage.Sets/src/mage/cards/c/CrabUmbra.java
index 86f5d56cf7..da173d8340 100644
--- a/Mage.Sets/src/mage/cards/c/CrabUmbra.java
+++ b/Mage.Sets/src/mage/cards/c/CrabUmbra.java
@@ -2,6 +2,7 @@
 package mage.cards.c;
 
 import java.util.UUID;
+
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
@@ -19,13 +20,12 @@ import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
- *
  * @author Loki
  */
 public final class CrabUmbra extends CardImpl {
 
     public CrabUmbra(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{U}");
         this.subtype.add(SubType.AURA);
 
 
@@ -35,8 +35,11 @@ public final class CrabUmbra extends CardImpl {
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
+
         // {2}{U}: Untap enchanted creature.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapEnchantedEffect(), new ManaCostsImpl("{2}{U}")));
+
+        // Totem armor
         this.addAbility(new TotemArmorAbility());
     }
 
diff --git a/Mage.Sets/src/mage/cards/d/DrakeUmbra.java b/Mage.Sets/src/mage/cards/d/DrakeUmbra.java
index 299d7b0737..8a124d093f 100644
--- a/Mage.Sets/src/mage/cards/d/DrakeUmbra.java
+++ b/Mage.Sets/src/mage/cards/d/DrakeUmbra.java
@@ -2,6 +2,7 @@
 package mage.cards.d;
 
 import java.util.UUID;
+
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.AttachEffect;
@@ -17,13 +18,12 @@ import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
- *
  * @author Loki
  */
 public final class DrakeUmbra extends CardImpl {
 
     public DrakeUmbra(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}");
         this.subtype.add(SubType.AURA);
 
 
@@ -33,9 +33,12 @@ public final class DrakeUmbra extends CardImpl {
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
+
         // Enchanted creature gets +3/+3 and has flying.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield)));
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA)));
+
+        // Totem armor
         this.addAbility(new TotemArmorAbility());
     }
 
diff --git a/Mage.Sets/src/mage/cards/e/EelUmbra.java b/Mage.Sets/src/mage/cards/e/EelUmbra.java
index d0d69cce3d..7438c42029 100644
--- a/Mage.Sets/src/mage/cards/e/EelUmbra.java
+++ b/Mage.Sets/src/mage/cards/e/EelUmbra.java
@@ -2,6 +2,7 @@
 package mage.cards.e;
 
 import java.util.UUID;
+
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.AttachEffect;
@@ -20,25 +21,28 @@ import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
- *
  * @author Loki
  */
 public final class EelUmbra extends CardImpl {
 
     public EelUmbra(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}");
         this.subtype.add(SubType.AURA);
 
-
+        // Flash
         this.addAbility(FlashAbility.getInstance());
+
         // Enchant creature
         TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
+
         // Enchanted creature gets +1/+1.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)));
+
+        // Totem armor
         this.addAbility(new TotemArmorAbility());
     }
 
diff --git a/Mage.Sets/src/mage/cards/e/ElandUmbra.java b/Mage.Sets/src/mage/cards/e/ElandUmbra.java
index 86a2c8be49..1cbee9cbfa 100644
--- a/Mage.Sets/src/mage/cards/e/ElandUmbra.java
+++ b/Mage.Sets/src/mage/cards/e/ElandUmbra.java
@@ -2,6 +2,7 @@
 package mage.cards.e;
 
 import java.util.UUID;
+
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.AttachEffect;
@@ -19,24 +20,25 @@ import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
- *
  * @author Loki
  */
 public final class ElandUmbra extends CardImpl {
 
     public ElandUmbra(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}");
         this.subtype.add(SubType.AURA);
 
-
         // Enchant creature
         TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
+
         // Enchanted creature gets +0/+4.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 4, Duration.WhileOnBattlefield)));
+
+        // Totem armor
         this.addAbility(new TotemArmorAbility());
     }
 
diff --git a/Mage.Sets/src/mage/cards/m/MammothUmbra.java b/Mage.Sets/src/mage/cards/m/MammothUmbra.java
index 4b67b0e72c..1734366642 100644
--- a/Mage.Sets/src/mage/cards/m/MammothUmbra.java
+++ b/Mage.Sets/src/mage/cards/m/MammothUmbra.java
@@ -2,6 +2,7 @@
 package mage.cards.m;
 
 import java.util.UUID;
+
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.AttachEffect;
@@ -17,13 +18,12 @@ import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
- *
  * @author Loki
  */
 public final class MammothUmbra extends CardImpl {
 
     public MammothUmbra(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{W}");
         this.subtype.add(SubType.AURA);
 
 
@@ -33,9 +33,12 @@ public final class MammothUmbra extends CardImpl {
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
+
         // Enchanted creature gets +3/+3 and has vigilance.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield)));
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA)));
+
+        // Totem armor
         this.addAbility(new TotemArmorAbility());
     }
 
diff --git a/Mage/src/main/java/mage/game/permanent/token/MaskToken.java b/Mage/src/main/java/mage/game/permanent/token/MaskToken.java
index 662ee9e060..fd1619f995 100644
--- a/Mage/src/main/java/mage/game/permanent/token/MaskToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/MaskToken.java
@@ -10,7 +10,6 @@ import mage.constants.SubType;
 import mage.target.TargetPermanent;
 
 /**
- *
  * @author TheElk801
  */
 public final class MaskToken extends TokenImpl {
@@ -18,8 +17,8 @@ public final class MaskToken extends TokenImpl {
     public MaskToken() {
         super(
                 "Mask", "white Aura enchantment token named Mask "
-                + "attached to another target permanent. "
-                + "The token has enchant permanent and totem armor."
+                        + "attached to another target permanent. "
+                        + "The token has enchant permanent and totem armor."
         );
         cardType.add(CardType.ENCHANTMENT);
         color.setWhite(true);
@@ -31,6 +30,7 @@ public final class MaskToken extends TokenImpl {
         ability.addEffect(new AttachEffect(Outcome.BoostCreature));
         this.addAbility(ability);
 
+        // Totem armor
         this.addAbility(new TotemArmorAbility());
     }