diff --git a/src/main/java/forge/quest/data/QuestBattleManager.java b/src/main/java/forge/quest/data/QuestBattleManager.java
index 91db20c5b96..b77758a8b5c 100644
--- a/src/main/java/forge/quest/data/QuestBattleManager.java
+++ b/src/main/java/forge/quest/data/QuestBattleManager.java
@@ -58,6 +58,8 @@ public class QuestBattleManager {
 
     /**
      * <p>getAIDeck.</p>
+     * Returns a deck object stored in the 
+     *{@link forge.quest.gui.main.aiDecks} map.
      *
      * @param deckName a {@link java.lang.String} object.
      * @return a {@link forge.deck.Deck} object.
@@ -70,17 +72,20 @@ public class QuestBattleManager {
 
         return aiDecks.get(deckName);
     }
-
+    
     /**
-     * <p>getAIDeckNewFormat.</p>
+     * <p>getDeckFromFile.</p>
+     * Returns a deck object built from a file name.
      *
      * @param deckName a {@link java.lang.String} object.
      * @return a {@link forge.deck.Deck} object.
      */
-    public static Deck getAIDeckNewFormat(String deckName) {
-        return (new DeckManager(ForgeProps.getFile(NewConstants.QUEST.DECKS))).getDeck(deckName);
-    }
-
+    public static Deck getDeckFromFile(String deckName) {
+        final File file = ForgeProps.getFile(NewConstants.QUEST.DECKS);
+        final DeckManager manager = new DeckManager(file);
+        return manager.getDeck(deckName);
+    } 
+    
     /**
      * <p>getAIDeckNames.</p>
      *
diff --git a/src/main/java/forge/quest/gui/main/QuestBattle.java b/src/main/java/forge/quest/gui/main/QuestBattle.java
index cdffa8f9c05..90a5843b440 100644
--- a/src/main/java/forge/quest/gui/main/QuestBattle.java
+++ b/src/main/java/forge/quest/gui/main/QuestBattle.java
@@ -59,7 +59,7 @@ public class QuestBattle extends QuestSelectablePanel {
         String[] oppDecks = QuestBattleManager.getOpponents();
         for (String oppDeckName : oppDecks) {
             // Get deck object and properties for this opponent.
-            oppDeck    = QuestBattleManager.getAIDeckNewFormat(oppDeckName);
+            oppDeck    = QuestBattleManager.getDeckFromFile(oppDeckName);
             
             oppName         = oppDeck.getMetadata("DisplayName");
             oppDiff         = oppDeck.getMetadata("Difficulty");
diff --git a/src/main/java/forge/quest/gui/main/QuestMainPanel.java b/src/main/java/forge/quest/gui/main/QuestMainPanel.java
index 14a77a4928a..07b2c8407fb 100644
--- a/src/main/java/forge/quest/gui/main/QuestMainPanel.java
+++ b/src/main/java/forge/quest/gui/main/QuestMainPanel.java
@@ -680,7 +680,7 @@ public class QuestMainPanel extends QuestAbstractPanel {
      */
     void setupBattle(Deck humanDeck) {
 
-        Deck computer = QuestBattleManager.getAIDeckNewFormat((selectedOpponent).getName());
+        Deck computer = QuestBattleManager.getDeckFromFile((selectedOpponent).getName());
         Constant.Runtime.ComputerDeck[0] = computer;
 
         AllZone.getGameAction().newGame(humanDeck, computer, forge.quest.data.QuestUtil.getHumanPlantAndPet(questData),
@@ -695,7 +695,7 @@ public class QuestMainPanel extends QuestAbstractPanel {
     private void setupQuest(Deck humanDeck) {
         Quest_Assignment selectedQuest = ((QuestQuest) selectedOpponent).getQuestAssignment();
 
-        Deck computerDeck = QuestBattleManager.getAIDeckNewFormat("quest" + selectedQuest.getId());
+        Deck computerDeck = QuestBattleManager.getDeckFromFile("quest" + selectedQuest.getId());
         Constant.Runtime.ComputerDeck[0] = computerDeck;
 
         AllZone.setQuestAssignment(selectedQuest);