diff --git a/src/main/java/forge/DefaultPlayerZone.java b/src/main/java/forge/DefaultPlayerZone.java
index 3229e3ec53f..4721686abdf 100644
--- a/src/main/java/forge/DefaultPlayerZone.java
+++ b/src/main/java/forge/DefaultPlayerZone.java
@@ -11,7 +11,7 @@ import java.util.Observable;
  * @version $Id$
  */
 public class DefaultPlayerZone extends PlayerZone implements java.io.Serializable {
-    /** Constant <code>serialVersionUID=-5687652485777639176L</code> */
+    /** Constant <code>serialVersionUID=-5687652485777639176L</code>. */
     private static final long serialVersionUID = -5687652485777639176L;
 
     private ArrayList<Card> cards = new ArrayList<Card>();
@@ -28,7 +28,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
      * @param zone a {@link java.lang.String} object.
      * @param inPlayer a {@link forge.Player} object.
      */
-    public DefaultPlayerZone(String zone, Player inPlayer) {
+    public DefaultPlayerZone(final String zone, final Player inPlayer) {
         zoneName = zone;
         player = inPlayer;
     }
@@ -39,11 +39,11 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
      *
      * @param o a {@link java.lang.Object} object.
      */
-    public void add(Object o) {
+    public final void add(final Object o) {
         Card c = (Card) o;
 
-        if (!c.isImmutable()) //Immutable cards are usually emblems,effects and the mana pool and we don't want to log those.
-        {
+        //Immutable cards are usually emblems,effects and the mana pool and we don't want to log those.
+        if (!c.isImmutable()) {
             cardsAddedThisTurn.add(c);
             if (AllZone.getZone(c) != null) {
                 cardsAddedThisTurnSource.add(AllZone.getZone(c).getZoneName());
@@ -62,7 +62,8 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
         //slight difference from above I guess, the card gets put into the grave first, then shuffled into library.
         //key is that this would trigger abilities that trigger on cards hitting the graveyard
         else if (is("Graveyard")
-                && c.hasKeyword("When CARDNAME is put into a graveyard from anywhere, shuffle it into its owner's library.")) {
+                && c.hasKeyword("When CARDNAME is put into a graveyard from anywhere, shuffle it into its owner's library."))
+        {
             PlayerZone lib = AllZone.getZone(Constant.Zone.Library, c.getOwner());
             PlayerZone grave = AllZone.getZone(Constant.Zone.Graveyard, c.getOwner());
 
@@ -79,8 +80,9 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
             PlayerZone lib = AllZone.getZone(Constant.Zone.Library, c.getOwner());
             PlayerZone grave = AllZone.getZone(Constant.Zone.Graveyard, c.getOwner());
             lib.add(c);
-            for (Card gc : AllZoneUtil.getPlayerGraveyard(c.getOwner()))
+            for (Card gc : AllZoneUtil.getPlayerGraveyard(c.getOwner())) {
                 lib.add(gc);
+            }
             grave.reset();
             c.getOwner().shuffle();
             return;
@@ -108,11 +110,11 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
      *
      * @param o a {@link java.lang.Object} object.
      */
-    public void addOnce(Object o) {
+    public final void addOnce(final Object o) {
         Card c = (Card) o;
 
-        if (!c.isImmutable()) //Immutable cards are usually emblems,effects and the mana pool and we don't want to log those.
-        {
+        //Immutable cards are usually emblems,effects and the mana pool and we don't want to log those.
+        if (!c.isImmutable()) {
             cardsAddedThisTurn.add(c);
             if (AllZone.getZone(c) != null) {
                 cardsAddedThisTurnSource.add(AllZone.getZone(c).getZoneName());
@@ -129,10 +131,10 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
 
     /**
      *
-     * @param ob
-     * @param object
+     * @param ob an Observable
+     * @param object an Object
      */
-    public void update(Observable ob, Object object) {
+    public final void update(final Observable ob, final Object object) {
         this.update();
     }
 
@@ -141,9 +143,9 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
      * @param c a {@link forge.Card} object.
      * @param index a int.
      */
-    public void add(Card c, int index) {
-        if (!c.isImmutable()) //Immutable cards are usually emblems,effects and the mana pool and we don't want to log those.
-        {
+    public final void add(final Card c, final int index) {
+        //Immutable cards are usually emblems,effects and the mana pool and we don't want to log those.
+        if (!c.isImmutable()) {
             cardsAddedThisTurn.add(c);
             if (AllZone.getZone(c) != null) {
                 cardsAddedThisTurnSource.add(AllZone.getZone(c).getZoneName());
@@ -159,9 +161,9 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
 
     /**
      *
-     * @param c
+     * @param c an Object
      */
-    public void remove(Object c) {
+    public final void remove(final Object c) {
         cards.remove((Card) c);
         update();
     }
@@ -171,7 +173,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
      *
      * @param c an array of {@link forge.Card} objects.
      */
-    public void setCards(Card c[]) {
+    public final void setCards(final Card[] c) {
         cards = new ArrayList<Card>(Arrays.asList(c));
         update();
     }
@@ -180,7 +182,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
     /**
      * <p>reset.</p>
      */
-    public void reset() {
+    public final void reset() {
         cardsAddedThisTurn.clear();
         cardsAddedThisTurnSource.clear();
         cards.clear();
@@ -193,7 +195,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
      * @param zone a {@link java.lang.String} object.
      * @return a boolean
      */
-    public boolean is(String zone) {
+    public final boolean is(final String zone) {
         return zone.equals(zoneName);
     }
 
@@ -203,7 +205,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
      * @param player a {@link forge.Player} object.
      * @return a boolean
      */
-    public boolean is(String zone, Player player) {
+    public final boolean is(final String zone, final Player player) {
         return (zone.equals(zoneName) && player.isPlayer(player));
     }
 
@@ -212,7 +214,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
      *
      * @return a {@link forge.Player} object.
      */
-    public Player getPlayer() {
+    public final Player getPlayer() {
         return player;
     }
 
@@ -221,7 +223,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
      *
      * @return a {@link java.lang.String} object.
      */
-    public String getZoneName() {
+    public final String getZoneName() {
         return zoneName;
     }
 
@@ -230,7 +232,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
      *
      * @return a int.
      */
-    public int size() {
+    public final int size() {
         return cards.size();
     }
 
@@ -239,7 +241,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
      * @param index a int.
      * @return  a int
      */
-    public Card get(int index) {
+    public final Card get(final int index) {
         return (Card) cards.get(index);
     }
 
@@ -248,8 +250,8 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
      *
      * @return an array of {@link forge.Card} objects.
      */
-    public Card[] getCards() {
-        Card c[] = new Card[cards.size()];
+    public final Card[] getCards() {
+        Card[] c = new Card[cards.size()];
         cards.toArray(c);
         return c;
     }
@@ -257,16 +259,17 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
     /**
      * <p>update.</p>
      */
-    public void update() {
-        if (update)
+    public final void update() {
+        if (update) {
             updateObservers();
+        }
     }
 
     /**
      *
      * @param b a boolean.
      */
-    public void setUpdate(boolean b) {
+    public final void setUpdate(final boolean b) {
         update = b;
     }
 
@@ -275,7 +278,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
      *
      * @return a boolean.
      */
-    public boolean getUpdate() {
+    public final boolean getUpdate() {
         return update;
     }
 
@@ -284,10 +287,11 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
      *
      * @return a {@link java.lang.String} object.
      */
-    public String toString() {
+    public final String toString() {
         StringBuilder sb = new StringBuilder();
-        if (player != null)
+        if (player != null) {
             sb.append(player.toString()).append(" ");
+        }
         sb.append(zoneName);
         return sb.toString();
     }
@@ -298,7 +302,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
      * @param origin a {@link java.lang.String} object.
      * @return a {@link forge.CardList} object.
      */
-    public CardList getCardsAddedThisTurn(String origin) {
+    public final CardList getCardsAddedThisTurn(final String origin) {
         System.out.print("Request cards put into " + getZoneName() + " from " + origin + ".Amount: ");
         CardList ret = new CardList();
         for (int i = 0; i < cardsAddedThisTurn.size(); i++) {
@@ -313,7 +317,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl
     /**
      * <p>resetCardsAddedThisTurn.</p>
      */
-    public void resetCardsAddedThisTurn() {
+    public final void resetCardsAddedThisTurn() {
         cardsAddedThisTurn.clear();
         cardsAddedThisTurnSource.clear();
     }
diff --git a/src/main/java/forge/HumanPlayer.java b/src/main/java/forge/HumanPlayer.java
index 038fd7eaa61..9d1df44fe59 100644
--- a/src/main/java/forge/HumanPlayer.java
+++ b/src/main/java/forge/HumanPlayer.java
@@ -18,7 +18,7 @@ public class HumanPlayer extends Player {
      *
      * @param myName a {@link java.lang.String} object.
      */
-    public HumanPlayer(String myName) {
+    public HumanPlayer(final String myName) {
         this(myName, 20, 0);
     }
 
@@ -29,7 +29,7 @@ public class HumanPlayer extends Player {
      * @param myLife a int.
      * @param myPoisonCounters a int.
      */
-    public HumanPlayer(String myName, int myLife, int myPoisonCounters) {
+    public HumanPlayer(final String myName, final int myLife, final int myPoisonCounters) {
         super(myName, myLife, myPoisonCounters);
     }
 
@@ -38,7 +38,7 @@ public class HumanPlayer extends Player {
      *
      * @return a {@link forge.Player} object.
      */
-    public Player getOpponent() {
+    public final Player getOpponent() {
         return AllZone.getComputerPlayer();
     }
 
@@ -53,7 +53,7 @@ public class HumanPlayer extends Player {
      *
      * @return a boolean.
      */
-    public boolean isHuman() {
+    public final boolean isHuman() {
         return true;
     }
 
@@ -62,7 +62,7 @@ public class HumanPlayer extends Player {
      *
      * @return a boolean.
      */
-    public boolean isComputer() {
+    public final boolean isComputer() {
         return false;
     }
 
@@ -73,14 +73,16 @@ public class HumanPlayer extends Player {
     ///////////////
 
     /** {@inheritDoc} */
-    public CardList mayDrawCards(int n) {
-        if (canDraw() && GameActionUtil.showYesNoDialog(null, "Draw " + n + " cards?"))
+    public final CardList mayDrawCards(final int n) {
+        if (canDraw() && GameActionUtil.showYesNoDialog(null, "Draw " + n + " cards?")) {
             return drawCards(n);
-        else return new CardList();
+        } else {
+            return new CardList();
+        }
     }
 
     /** {@inheritDoc} */
-    public CardList mayDrawCard() {
+    public final CardList mayDrawCard() {
         return mayDrawCards(1);
     }
 
@@ -89,9 +91,9 @@ public class HumanPlayer extends Player {
      *
      * @return a boolean.
      */
-    public boolean dredge() {
+    public final boolean dredge() {
         boolean dredged = false;
-        String choices[] = {"Yes", "No"};
+        String[] choices = {"Yes", "No"};
         Object o = GuiUtils.getChoice("Do you want to dredge?", choices);
         if (o.equals("Yes")) {
             Card c = (Card) GuiUtils.getChoice("Select card to dredge", getDredge().toArray());
@@ -115,7 +117,7 @@ public class HumanPlayer extends Player {
     }
 
     /** {@inheritDoc} */
-    public CardList discard(final int num, final SpellAbility sa, boolean duringResolution) {
+    public final CardList discard(final int num, final SpellAbility sa, final boolean duringResolution) {
         AllZone.getInputControl().setInput(PlayerUtil.input_discard(num, sa), duringResolution);
 
         // why is CardList returned?
@@ -123,20 +125,23 @@ public class HumanPlayer extends Player {
     }
 
     /** {@inheritDoc} */
-    public void discardUnless(int num, String uType, SpellAbility sa) {
+    public final void discardUnless(final int num, final String uType, final SpellAbility sa) {
         AllZone.getInputControl().setInput(PlayerUtil.input_discardNumUnless(num, uType, sa));
     }
-    
+
     protected void discard_Chains_of_Mephistopheles() {
-    	AllZone.getInputControl().setInput(PlayerUtil.input_chainsDiscard(), true);
+        AllZone.getInputControl().setInput(PlayerUtil.input_chainsDiscard(), true);
     }
 
     /** {@inheritDoc} */
-    public void handToLibrary(final int numToLibrary, String libPos) {
-        if (libPos.equals("Top") || libPos.equals("Bottom")) libPos = libPos.toLowerCase();
-        else {
+    public final void handToLibrary(final int numToLibrary, String libPos) {
+        if (libPos.equals("Top") || libPos.equals("Bottom")) {
+            libPos = libPos.toLowerCase();
+        } else {
             String s = "card";
-            if (numToLibrary > 1) s += "s";
+            if (numToLibrary > 1) {
+                s += "s";
+            }
 
             Object o = GuiUtils.getChoice("Do you want to put the " + s
                     + " on the top or bottom of your library?", new Object[]{"top", "bottom"});
@@ -146,16 +151,18 @@ public class HumanPlayer extends Player {
     }
 
     /** {@inheritDoc} */
-    protected void doScry(final CardList topN, final int N) {
-        int num = N;
+    protected final void doScry(final CardList topN, final int n) {
+        int num = n;
         for (int i = 0; i < num; i++) {
             Object o = GuiUtils.getChoiceOptional("Put on bottom of library.", topN.toArray());
             if (o != null) {
                 Card c = (Card) o;
                 topN.remove(c);
                 AllZone.getGameAction().moveToBottomOfLibrary(c);
-            } else // no card chosen for the bottom
+            } else {
+                // no card chosen for the bottom
                 break;
+            }
         }
         num = topN.size();
         for (int i = 0; i < num; i++) {
@@ -171,15 +178,15 @@ public class HumanPlayer extends Player {
     }
 
     /** {@inheritDoc} */
-    public void sacrificePermanent(String prompt, CardList choices) {
+    public final void sacrificePermanent(final String prompt, final CardList choices) {
         Input in = PlayerUtil.input_sacrificePermanent(choices, prompt);
         AllZone.getInputControl().setInput(in);
     }
 
     /** {@inheritDoc} */
-    protected void clashMoveToTopOrBottom(Card c) {
+    protected final void clashMoveToTopOrBottom(final Card c) {
         String choice = "";
-        String choices[] = {"top", "bottom"};
+        String[] choices = {"top", "bottom"};
         AllZone.getDisplay().setCard(c);
         choice = (String) GuiUtils.getChoice(c.getName() + " - Top or bottom of Library", choices);
 
diff --git a/src/main/java/forge/Move.java b/src/main/java/forge/Move.java
index e495c687bb8..67a5a07fa77 100644
--- a/src/main/java/forge/Move.java
+++ b/src/main/java/forge/Move.java
@@ -12,14 +12,14 @@ public abstract class Move {
      *
      * @return an array of {@link forge.Move} objects.
      */
-    abstract public Move[] generateMoves();
+    public abstract Move[] generateMoves();
 
     /**
      * <p>getScore.</p>
      *
      * @return a int.
      */
-    abstract public int getScore();
+    public abstract int getScore();
 
     public Move bestMove = null;
     public int bestScore = Integer.MIN_VALUE;
@@ -31,14 +31,16 @@ public abstract class Move {
      * @param depth a int.
      * @return a int.
      */
-    public int min(Move move, int depth) {
-        if (depth == 0)
+    public final int min(final Move move, final int depth) {
+        if (depth == 0) {
             return move.getScore();
+        }
 
-        Move v[] = move.generateMoves();
+        Move[] v = move.generateMoves();
         int score = Integer.MAX_VALUE;
-        for (int i = 0; i < v.length; i++)
+        for (int i = 0; i < v.length; i++) {
             score = Math.min(score, max(v[i], depth - 1, false));
+        }
         return score;
     }
 
@@ -50,11 +52,12 @@ public abstract class Move {
      * @param first a boolean.
      * @return a int.
      */
-    public int max(Move move, int depth, boolean first) {
-        if (depth == 0)
+    public final int max(final Move move, final int depth, final boolean first) {
+        if (depth == 0) {
             return move.getScore();
+        }
 
-        Move v[] = move.generateMoves();
+        Move[] v = move.generateMoves();
         int score = Integer.MIN_VALUE;
         for (int i = 0; i < v.length; i++) {
             score = Math.max(score, min(v[i], depth - 1));
@@ -63,7 +66,7 @@ public abstract class Move {
                 bestScore = score;
                 bestMove = v[i];
             }
-        }//for
+        } //for
         return score;
-    }//max()
+    } //max()
 }
diff --git a/src/main/java/forge/MyButton.java b/src/main/java/forge/MyButton.java
index d4fd90f6f1b..392071c7403 100644
--- a/src/main/java/forge/MyButton.java
+++ b/src/main/java/forge/MyButton.java
@@ -11,38 +11,38 @@ public interface MyButton {
     /**
      * <p>select.</p>
      */
-    public void select();
+    void select();
 
     /**
      * <p>setSelectable.</p>
      *
      * @param b a boolean.
      */
-    public void setSelectable(boolean b);
+    void setSelectable(boolean b);
 
     /**
      * <p>isSelectable.</p>
      *
      * @return a boolean.
      */
-    public boolean isSelectable();
+    boolean isSelectable();
 
     /**
      * <p>getText.</p>
      *
      * @return a {@link java.lang.String} object.
      */
-    public String getText();
+    String getText();
 
     /**
      * <p>setText.</p>
      *
      * @param text a {@link java.lang.String} object.
      */
-    public void setText(String text);
+    void setText(String text);
 
     /**
      * <p>reset.</p>
      */
-    public void reset(); //resets the text and calls setSelectable(false)
+    void reset(); //resets the text and calls setSelectable(false)
 }
diff --git a/src/main/java/forge/Phase.java b/src/main/java/forge/Phase.java
index 4359cdc4dc2..86d1160f934 100644
--- a/src/main/java/forge/Phase.java
+++ b/src/main/java/forge/Phase.java
@@ -682,7 +682,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
     /**
      * <p>passPriority.</p>
      */
-    public void passPriority() {
+    public final void passPriority() {
         Player actingPlayer = getPriorityPlayer();
         Player lastToAct = getFirstPriority();
 
@@ -700,8 +700,9 @@ public class Phase extends MyObservable implements java.io.Serializable {
                 needToNextPhase = true;
                 pPlayerPriority = getPlayerTurn();    // this needs to be set early as we exit the phase
             } else {
-                if (!AllZone.getStack().hasSimultaneousStackEntries())
+                if (!AllZone.getStack().hasSimultaneousStackEntries()) {
                     AllZone.getStack().resolveStack();
+                }
             }
             AllZone.getStack().chooseOrderOfSimultaneousStackEntryAll();
         }
@@ -709,7 +710,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
 
     /** {@inheritDoc} */
     @Override
-    public void addObserver(Observer o) {
+    public final void addObserver(final Observer o) {
         super.deleteObservers();
         super.addObserver(o);
     }
@@ -721,7 +722,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
      *
      * @param needToNextPhase a boolean.
      */
-    public void setNeedToNextPhase(boolean needToNextPhase) {
+    public final void setNeedToNextPhase(boolean needToNextPhase) {
         this.needToNextPhase = needToNextPhase;
     }
 
@@ -730,7 +731,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
      *
      * @return a boolean.
      */
-    public boolean isNeedToNextPhase() {
+    public final boolean isNeedToNextPhase() {
         return this.needToNextPhase;
     }
 
@@ -742,7 +743,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
      *
      * @return a boolean.
      */
-    public boolean isNeedToNextPhaseInit() {
+    public final boolean isNeedToNextPhaseInit() {
         needToNextPhaseInit++;
         if (needToNextPhaseInit <= 4) {
             return true;
@@ -756,7 +757,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
      * @param player a {@link forge.Player} object.
      * @return a boolean.
      */
-    public static boolean canCastSorcery(Player player) {
+    public static boolean canCastSorcery(final Player player) {
         return AllZone.getPhase().isPlayerTurn(player) && (AllZone.getPhase().getPhase().equals(Constant.Phase.Main2) ||
                 AllZone.getPhase().getPhase().equals(Constant.Phase.Main1)) && AllZone.getStack().size() == 0;
     }
@@ -768,22 +769,25 @@ public class Phase extends MyObservable implements java.io.Serializable {
      * @param endPhase a {@link java.lang.String} object.
      * @return a {@link java.lang.String} object.
      */
-    public String buildActivateString(String startPhase, String endPhase) {
+    public final String buildActivateString(final String startPhase, final String endPhase) {
         StringBuilder sb = new StringBuilder();
 
         boolean add = false;
         for (int i = 0; i < phaseOrder.length; i++) {
-            if (phaseOrder[i].equals(startPhase))
+            if (phaseOrder[i].equals(startPhase)) {
                 add = true;
+            }
 
             if (add) {
-                if (sb.length() != 0)
+                if (sb.length() != 0) {
                     sb.append(",");
+                }
                 sb.append(phaseOrder[i]);
             }
 
-            if (phaseOrder[i].equals(endPhase))
+            if (phaseOrder[i].equals(endPhase)) {
                 add = false;
+            }
         }
 
         return sb.toString();
@@ -794,7 +798,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
      *
      * @param sp a {@link forge.card.spellability.SpellAbility} object.
      */
-    public static void increaseSpellCount(SpellAbility sp) {
+    public static void increaseSpellCount(final SpellAbility sp) {
         incrementStormCount();
 
         if (sp.getActivatingPlayer().isHuman()) {
@@ -884,7 +888,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
      *
      * @param stormCount a int.
      */
-    public static void setStormCount(int stormCount) {
+    public static void setStormCount(final int stormCount) {
         StormCount = stormCount;
     }
 
@@ -902,7 +906,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
      *
      * @param gameBegins a int.
      */
-    public static void setGameBegins(int gameBegins) {
+    public static void setGameBegins(final int gameBegins) {
         GameBegins = gameBegins;
     }
 
@@ -922,7 +926,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
      *
      * @param phaseID a {@link java.lang.String} object.
      */
-    public void setDevPhaseState(String phaseID) {
+    public final void setDevPhaseState(final String phaseID) {
         this.phaseIndex = findIndex(phaseID);
     }
 
@@ -940,7 +944,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
      *
      * @param i a int.
      */
-    static void setPlayerSpellCount(int i) {
+    static void setPlayerSpellCount(final int i) {
         PlayerSpellCount = (i);
     }
 
@@ -958,7 +962,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
      *
      * @param i a int.
      */
-    static void setPlayerCreatureSpellCount(int i) {
+    static void setPlayerCreatureSpellCount(final int i) {
         PlayerCreatureSpellCount = (i);
     }
 
@@ -976,7 +980,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
      *
      * @param i a int.
      */
-    static void setPlayerInstantSpellCount(int i) {
+    static void setPlayerInstantSpellCount(final int i) {
         PlayerInstantSpellCount = (i);
     }
 
@@ -994,7 +998,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
      *
      * @param i a int.
      */
-    static void setComputerSpellCount(int i) {
+    static void setComputerSpellCount(final int i) {
         ComputerSpellCount = (i);
     }
 
@@ -1012,7 +1016,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
      *
      * @param i a int.
      */
-    static void setComputerCreatureSpellCount(int i) {
+    static void setComputerCreatureSpellCount(final int i) {
         ComputerCreatureSpellCount = (i);
     }
 
@@ -1030,11 +1034,16 @@ public class Phase extends MyObservable implements java.io.Serializable {
      *
      * @param i a int.
      */
-    static void setComputerInstantSpellCount(int i) {
+    static void setComputerInstantSpellCount(final int i) {
         ComputerInstantSpellCount = (i);
     }
 
-    public void setPreventCombatDamageThisTurn(boolean b) {
+    /**
+     * 
+     * TODO Write javadoc for this method.
+     * @param b a boolean
+     */
+    public final void setPreventCombatDamageThisTurn(final boolean b) {
         bPreventCombatDamageThisTurn = true;
     }
 }