diff --git a/Mage.Sets/src/mage/cards/b/BrunaTheFadingLight.java b/Mage.Sets/src/mage/cards/b/BrunaTheFadingLight.java
index 23af75385ba..967037b12ea 100644
--- a/Mage.Sets/src/mage/cards/b/BrunaTheFadingLight.java
+++ b/Mage.Sets/src/mage/cards/b/BrunaTheFadingLight.java
@@ -1,7 +1,5 @@
-
 package mage.cards.b;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
@@ -18,25 +16,28 @@ import mage.constants.SubType;
 import mage.constants.SuperType;
 import mage.constants.Zone;
 import mage.filter.FilterCard;
+import mage.filter.common.FilterCreatureCard;
 import mage.filter.predicate.Predicates;
 import mage.target.common.TargetCardInYourGraveyard;
 
+import java.util.UUID;
+
 /**
- *
  * @author fireshoes
  */
 public final class BrunaTheFadingLight extends CardImpl {
 
-    private static final FilterCard filter = new FilterCard("Angel or Human creature card");
+    private static final FilterCard filter = new FilterCreatureCard("Angel or Human creature card");
 
     static {
-        filter.add(Predicates.and(CardType.CREATURE.getPredicate(),
-                (Predicates.or(SubType.HUMAN.getPredicate(),
-                    (SubType.ANGEL.getPredicate())))));
+        filter.add(Predicates.or(
+                SubType.HUMAN.getPredicate(),
+                SubType.ANGEL.getPredicate()
+        ));
     }
 
     public BrunaTheFadingLight(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{W}{W}");
         addSuperType(SuperType.LEGENDARY);
         this.subtype.add(SubType.ANGEL, SubType.HORROR);
         this.power = new MageInt(5);
@@ -56,7 +57,7 @@ public final class BrunaTheFadingLight extends CardImpl {
         this.addAbility(VigilanceAbility.getInstance());
 
         // <i>(Melds with Gisela, the Broken Blade.)</i>
-        this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("(Melds with Gisela, the Broken Blade.)")));
+        this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("<i>(Melds with Gisela, the Broken Blade.)</i>")));
     }
 
     private BrunaTheFadingLight(final BrunaTheFadingLight card) {
diff --git a/Mage.Sets/src/mage/cards/h/HanweirGarrison.java b/Mage.Sets/src/mage/cards/h/HanweirGarrison.java
index aad17ff02fe..670b6be286f 100644
--- a/Mage.Sets/src/mage/cards/h/HanweirGarrison.java
+++ b/Mage.Sets/src/mage/cards/h/HanweirGarrison.java
@@ -31,7 +31,7 @@ public final class HanweirGarrison extends CardImpl {
         this.addAbility(new AttacksTriggeredAbility(new CreateTokenEffect(new RedHumanToken(), 2, true, true), false));
 
         // <i>(Melds with Hanweir Battlements.)</i>
-        this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("(Melds with Hannweir Battlements.)")));
+        this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("<i>(Melds with Hanweir Battlements.)</i>")));
     }
 
     private HanweirGarrison(final HanweirGarrison card) {
diff --git a/Mage.Sets/src/mage/cards/m/MidnightScavengers.java b/Mage.Sets/src/mage/cards/m/MidnightScavengers.java
index d0626c7aa0b..bbc7d405cc9 100644
--- a/Mage.Sets/src/mage/cards/m/MidnightScavengers.java
+++ b/Mage.Sets/src/mage/cards/m/MidnightScavengers.java
@@ -45,7 +45,7 @@ public final class MidnightScavengers extends CardImpl {
         this.addAbility(ability);
 
         // <i>(Melds with Graf Rats.)</i>
-        this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("(Melds with Graf Rats.)")));
+        this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("<i>(Melds with Graf Rats.)</i>")));
     }
 
     private MidnightScavengers(final MidnightScavengers card) {
diff --git a/Mage.Sets/src/mage/cards/t/TortoiseFormation.java b/Mage.Sets/src/mage/cards/t/TortoiseFormation.java
index cf5e90074d6..06be216742a 100644
--- a/Mage.Sets/src/mage/cards/t/TortoiseFormation.java
+++ b/Mage.Sets/src/mage/cards/t/TortoiseFormation.java
@@ -1,27 +1,28 @@
-
 package mage.cards.t;
 
-import java.util.UUID;
 import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
 import mage.abilities.keyword.ShroudAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
-import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.StaticFilters;
+
+import java.util.UUID;
 
 /**
- *
  * @author North
  */
 public final class TortoiseFormation extends CardImpl {
 
     public TortoiseFormation(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{U}");
-
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{U}");
 
         // Creatures you control gain shroud until end of turn.
-        this.getSpellAbility().addEffect(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent()));
+        this.getSpellAbility().addEffect(new GainAbilityControlledEffect(
+                ShroudAbility.getInstance(), Duration.EndOfTurn,
+                StaticFilters.FILTER_CONTROLLED_CREATURES
+        ));
     }
 
     private TortoiseFormation(final TortoiseFormation card) {