diff --git a/Mage.Sets/src/mage/cards/c/CrazedFirecat.java b/Mage.Sets/src/mage/cards/c/CrazedFirecat.java
index dac9cfa97a..a19b1e8233 100644
--- a/Mage.Sets/src/mage/cards/c/CrazedFirecat.java
+++ b/Mage.Sets/src/mage/cards/c/CrazedFirecat.java
@@ -1,7 +1,6 @@
 
 package mage.cards.c;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@@ -9,15 +8,16 @@ import mage.abilities.effects.OneShotEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.SubType;
 import mage.constants.Outcome;
+import mage.constants.SubType;
 import mage.counters.CounterType;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 
+import java.util.UUID;
+
 /**
- *
  * @author TheElk801
  */
 public final class CrazedFirecat extends CardImpl {
@@ -34,7 +34,7 @@ public final class CrazedFirecat extends CardImpl {
         this.addAbility(new EntersBattlefieldTriggeredAbility(new CrazedFirecatEffect(), false));
     }
 
-    public CrazedFirecat(final CrazedFirecat card) {
+    private CrazedFirecat(final CrazedFirecat card) {
         super(card);
     }
 
@@ -46,12 +46,12 @@ public final class CrazedFirecat extends CardImpl {
 
 class CrazedFirecatEffect extends OneShotEffect {
 
-    public CrazedFirecatEffect() {
+    CrazedFirecatEffect() {
         super(Outcome.Benefit);
-        this.staticText = "flip a coin until you lose a flip. Put a +1/+1 counter on {this} for each flip you win.";
+        this.staticText = "flip a coin until you lose a flip. Put a +1/+1 counter on {this} for each flip you won.";
     }
 
-    public CrazedFirecatEffect(final CrazedFirecatEffect effect) {
+    private CrazedFirecatEffect(final CrazedFirecatEffect effect) {
         super(effect);
     }
 
diff --git a/Mage.Sets/src/mage/cards/d/DarkDepths.java b/Mage.Sets/src/mage/cards/d/DarkDepths.java
index 61b87fc341..763a32c0de 100644
--- a/Mage.Sets/src/mage/cards/d/DarkDepths.java
+++ b/Mage.Sets/src/mage/cards/d/DarkDepths.java
@@ -1,7 +1,6 @@
 
 package mage.cards.d;
 
-import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.StateTriggeredAbility;
 import mage.abilities.common.EntersBattlefieldAbility;
@@ -22,8 +21,9 @@ import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 import mage.game.permanent.token.MaritLageToken;
 
+import java.util.UUID;
+
 /**
- *
  * @author Plopman
  */
 public final class DarkDepths extends CardImpl {
@@ -106,7 +106,8 @@ class DarkDepthsAbility extends StateTriggeredAbility {
 
     @Override
     public String getRule() {
-        return "When {this} has no ice counters on it, sacrifice it. If you do, create a legendary 20/20 black Avatar creature token with flying and indestructible named Marit Lage.";
+        return "When {this} has no ice counters on it, sacrifice it. If you do, " +
+                "create Marit Lage, a legendary 20/20 black Avatar creature token with flying and indestructible.";
     }
 
 }
diff --git a/Mage.Sets/src/mage/cards/l/LordOfAtlantis.java b/Mage.Sets/src/mage/cards/l/LordOfAtlantis.java
index cc1f2124e8..b2e8fb06f0 100644
--- a/Mage.Sets/src/mage/cards/l/LordOfAtlantis.java
+++ b/Mage.Sets/src/mage/cards/l/LordOfAtlantis.java
@@ -1,7 +1,6 @@
 
 package mage.cards.l;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
@@ -16,22 +15,18 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.mageobject.SubtypePredicate;
+
+import java.util.UUID;
 
 /**
- *
  * @author jonubuu
  */
 public final class LordOfAtlantis extends CardImpl {
 
-    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Merfolk creatures");
-
-    static {
-        filter.add(new SubtypePredicate(SubType.MERFOLK));
-    }
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(SubType.MERFOLK, "Merfolk");
 
     public LordOfAtlantis(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{U}{U}");
         this.subtype.add(SubType.MERFOLK);
 
         this.power = new MageInt(2);
@@ -39,7 +34,7 @@ public final class LordOfAtlantis extends CardImpl {
 
         // Other Merfolk creatures get +1/+1 and have islandwalk.
         Effect effect = new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true);
-        effect.setText("Other Merfolk creatures get +1/+1");
+        effect.setText("Other Merfolk get +1/+1");
         Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect);
         effect = new GainAbilityAllEffect(new IslandwalkAbility(), Duration.WhileOnBattlefield, filter, true);
         effect.setText("and have islandwalk");
diff --git a/Mage/src/main/java/mage/game/permanent/token/MaritLageToken.java b/Mage/src/main/java/mage/game/permanent/token/MaritLageToken.java
index db390f1d50..c8d839e692 100644
--- a/Mage/src/main/java/mage/game/permanent/token/MaritLageToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/MaritLageToken.java
@@ -1,21 +1,21 @@
 
 
 package mage.game.permanent.token;
-import mage.constants.CardType;
-import mage.constants.SubType;
+
 import mage.MageInt;
 import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.IndestructibleAbility;
+import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.constants.SuperType;
 
 /**
- *
  * @author spjspj
  */
 public final class MaritLageToken extends TokenImpl {
 
     public MaritLageToken() {
-        super("Marit Lage", "legendary 20/20 black Avatar creature token with flying and indestructible named Marit Lage");
+        super("Marit Lage", "Marit Lage, a legendary 20/20 black Avatar creature token with flying and indestructible");
         this.setOriginalExpansionSetCode("CSP");
         cardType.add(CardType.CREATURE);
         subtype.add(SubType.AVATAR);