diff --git a/src/magic/card/Demon_s_Horn.java b/src/magic/card/Demon_s_Horn.java
index 2cfb1dfade..29ed50ff8a 100644
--- a/src/magic/card/Demon_s_Horn.java
+++ b/src/magic/card/Demon_s_Horn.java
@@ -16,21 +16,17 @@ import magic.model.trigger.MagicWhenOtherSpellIsCastTrigger;
 public class Demon_s_Horn {
     public static final MagicWhenOtherSpellIsCastTrigger T = new MagicWhenOtherSpellIsCastTrigger() {
         @Override
-        public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack data) {
-            final MagicPlayer player = permanent.getController();
-            final MagicCard card = data.getCard();
-            return (MagicColor.Black.hasColor(card.getColorFlags())) ?
-                    new MagicEvent(
-                            permanent,
-                            player,
-                            new MagicSimpleMayChoice(
-                                    player + " may gain 1 life.",
-                                    MagicSimpleMayChoice.GAIN_LIFE,
-                                    1,
-                                    MagicSimpleMayChoice.DEFAULT_YES),
-                            this,
-                            player + " may$ gain 1 life.") :
-                    MagicEvent.NONE;
+        public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack spell) {
+            return MagicColor.Black.hasColor(spell.getColorFlags()) ?
+                new MagicEvent(
+                    permanent,
+                    new MagicSimpleMayChoice(
+                        MagicSimpleMayChoice.GAIN_LIFE,
+                        1,
+                        MagicSimpleMayChoice.DEFAULT_YES),
+                    this,
+                    "PN may$ gain 1 life.") :
+                MagicEvent.NONE;
         }
         
         @Override
diff --git a/src/magic/card/Driver_of_the_Dead.java b/src/magic/card/Driver_of_the_Dead.java
index 935264d5f6..5559034949 100644
--- a/src/magic/card/Driver_of_the_Dead.java
+++ b/src/magic/card/Driver_of_the_Dead.java
@@ -19,40 +19,32 @@ import magic.model.trigger.MagicGraveyardTriggerData;
 import magic.model.trigger.MagicWhenPutIntoGraveyardTrigger;
 
 public class Driver_of_the_Dead {
+    private static final MagicTargetFilter targetFilter = new MagicTargetFilter.MagicCMCTargetFilter(
+        MagicTargetFilter.TARGET_CREATURE_CARD_FROM_GRAVEYARD,
+        MagicTargetFilter.MagicCMCTargetFilter.LESS_THAN_OR_EQUAL,
+        2
+    );
+    private static final MagicTargetChoice targetChoice = new MagicTargetChoice(
+        targetFilter,false,MagicTargetHint.None,
+        "target creature card from your graveyard)"
+    );
     public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(
                 final MagicGame game,
                 final MagicPermanent permanent,
                 final MagicGraveyardTriggerData triggerData) {
-            if (MagicLocationType.Play == triggerData.fromLocation) {
-                final MagicPlayer player = permanent.getController();
-                final MagicTargetFilter targetFilter =
-                        new MagicTargetFilter.MagicCMCTargetFilter(
-                        MagicTargetFilter.TARGET_CREATURE_CARD_FROM_GRAVEYARD,
-                        MagicTargetFilter.MagicCMCTargetFilter.LESS_THAN_OR_EQUAL,
-                        2);
-                final MagicTargetChoice targetChoice = 
-                        new MagicTargetChoice(
-                        targetFilter,false,MagicTargetHint.None,
-                        "target creature card from your graveyard)");
-                final MagicChoice mayChoice = 
-                        new MagicMayChoice(
-                        player + " may return target creature card with " +
-                        "converted mana cost 2 or less " +
-                        "from his or her graveyard to the battlefield.",
-                        targetChoice);
-                return new MagicEvent(
-                        permanent,
-                        player,
-                        mayChoice,
-                        new MagicGraveyardTargetPicker(false),
-                        this,
-                        player + " may$ return target creature card$ with " +
-                        "converted mana cost 2 or less " +
-                        "from his or her graveyard to the battlefield.");
-            }
-            return MagicEvent.NONE;
+            return (MagicLocationType.Play == triggerData.fromLocation) ?
+                new MagicEvent(
+                    permanent,
+                    new MagicMayChoice(targetChoice),
+                    new MagicGraveyardTargetPicker(false),
+                    this,
+                    "PN may$ return target creature card$ with " +
+                    "converted mana cost 2 or less " +
+                    "from his or her graveyard to the battlefield."
+                ):
+                MagicEvent.NONE;
         }
         @Override
         public void executeEvent(
diff --git a/src/magic/card/Kraken_s_Eye.java b/src/magic/card/Kraken_s_Eye.java
index 9e9fa9fa80..503302724d 100644
--- a/src/magic/card/Kraken_s_Eye.java
+++ b/src/magic/card/Kraken_s_Eye.java
@@ -16,21 +16,17 @@ import magic.model.trigger.MagicWhenOtherSpellIsCastTrigger;
 public class Kraken_s_Eye {
     public static final MagicWhenOtherSpellIsCastTrigger T = new MagicWhenOtherSpellIsCastTrigger() {
         @Override
-        public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack data) {
-            final MagicPlayer player = permanent.getController();
-            final MagicCard card = data.getCard();
-            return (MagicColor.Blue.hasColor(card.getColorFlags())) ?
-                    new MagicEvent(
-                            permanent,
-                            player,
-                            new MagicSimpleMayChoice(
-                                    player + " may gain 1 life.",
-                                    MagicSimpleMayChoice.GAIN_LIFE,
-                                    1,
-                                    MagicSimpleMayChoice.DEFAULT_YES),
-                            this,
-                            player + " may$ gain 1 life.") :
-                    MagicEvent.NONE;
+        public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack spell) {
+            return MagicColor.Blue.hasColor(spell.getColorFlags()) ?
+                new MagicEvent(
+                    permanent,
+                    new MagicSimpleMayChoice(
+                        MagicSimpleMayChoice.GAIN_LIFE,
+                        1,
+                        MagicSimpleMayChoice.DEFAULT_YES),
+                    this,
+                    "PN may$ gain 1 life.") :
+                MagicEvent.NONE;
         }
         
         @Override
diff --git a/src/magic/card/Moroii.java b/src/magic/card/Moroii.java
index 9af492023c..a3fa9af750 100644
--- a/src/magic/card/Moroii.java
+++ b/src/magic/card/Moroii.java
@@ -11,14 +11,13 @@ import magic.model.trigger.MagicAtUpkeepTrigger;
 public class Moroii {
     public static final MagicAtUpkeepTrigger T = new MagicAtUpkeepTrigger() {
         @Override
-        public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer data) {
-            final MagicPlayer player=permanent.getController();
-            return (player==data) ?
+        public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer upkeepPlayer) {
+            return permanent.isController(upkeepPlayer) ?
                 new MagicEvent(
-                        permanent,
-                        player,
-                        this,
-                        player + " loses 1 life.") :
+                    permanent,
+                    this,
+                    "PN loses 1 life."
+                ):
                 MagicEvent.NONE;
         }
         
diff --git a/src/magic/card/Soltari_Champion.java b/src/magic/card/Soltari_Champion.java
index 2d6771147f..72bb7d6655 100644
--- a/src/magic/card/Soltari_Champion.java
+++ b/src/magic/card/Soltari_Champion.java
@@ -17,15 +17,13 @@ public class Soltari_Champion {
         public MagicEvent executeTrigger(
                 final MagicGame game,
                 final MagicPermanent permanent,
-                final MagicPermanent data) {
-            final MagicPlayer player = permanent.getController();
-            return (permanent == data) ?
+                final MagicPermanent attacker) {
+            return (permanent == attacker) ?
                 new MagicEvent(
                     permanent,
-                    player,
                     this,
-                    "Other creatures " + player +
-                    " controls get +1/+1 until end of turn."):
+                    "Other creatures PN controls get +1/+1 until end of turn."
+                ):
                 MagicEvent.NONE;
         }    
         @Override
diff --git a/src/magic/card/Soul_Warden.java b/src/magic/card/Soul_Warden.java
index 9c17085e46..cd4e96f411 100644
--- a/src/magic/card/Soul_Warden.java
+++ b/src/magic/card/Soul_Warden.java
@@ -11,13 +11,13 @@ public class Soul_Warden {
     public static final MagicWhenOtherComesIntoPlayTrigger T = new MagicWhenOtherComesIntoPlayTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPermanent otherPermanent) {
-            final MagicPlayer player = permanent.getController();
-            return (otherPermanent != permanent && otherPermanent.isCreature()) ?
+            return (otherPermanent != permanent && 
+                    otherPermanent.isCreature()) ?
                 new MagicEvent(
-                        permanent,
-                        player,
-                        this,
-                        player + " gains 1 life."):
+                    permanent,
+                    this,
+                    "PN gains 1 life."
+                ):
                 MagicEvent.NONE;
         }
         
diff --git a/src/magic/card/Treasure_Hunter.java b/src/magic/card/Treasure_Hunter.java
index ef55be9597..ce53b03a38 100644
--- a/src/magic/card/Treasure_Hunter.java
+++ b/src/magic/card/Treasure_Hunter.java
@@ -20,16 +20,14 @@ public class Treasure_Hunter {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPlayer player) {
             return new MagicEvent(
-                    permanent,
-                    player,
-                    new MagicMayChoice(
-                        player + " may return target artifact card from " +
-                        "his or her graveyard to his or her hand.",
-                        MagicTargetChoice.TARGET_ARTIFACT_CARD_FROM_GRAVEYARD),
-                    new MagicGraveyardTargetPicker(false),
-                    this,
-                    player + " may$ return target artifact card$ from " +
-                    "his or her graveyard to his or her hand.");
+                permanent,
+                new MagicMayChoice(
+                    MagicTargetChoice.TARGET_ARTIFACT_CARD_FROM_GRAVEYARD
+                ),
+                new MagicGraveyardTargetPicker(false),
+                this,
+                "PN may$ return target artifact card$ from " +
+                "his or her graveyard to his or her hand.");
         }
         
         @Override