diff --git a/Mage.Client/src/main/java/mage/client/components/MageRoundPane.java b/Mage.Client/src/main/java/mage/client/components/MageRoundPane.java
index 4d318a7beda..914f1bce766 100644
--- a/Mage.Client/src/main/java/mage/client/components/MageRoundPane.java
+++ b/Mage.Client/src/main/java/mage/client/components/MageRoundPane.java
@@ -26,7 +26,7 @@ public class MageRoundPane extends JPanel {
     private int Y_OFFSET = 30;
     private final Color defaultBackgroundColor = new Color(141, 130, 112, 200);
     private Color backgroundColor = defaultBackgroundColor;
-    private final int alpha = 0;
+    private static final int alpha = 0;
     private static final Map<ShadowKey, BufferedImage> SHADOW_IMAGE_CACHE;
     private static final Map<Key, BufferedImage> IMAGE_CACHE;
 
diff --git a/Mage.Client/src/main/java/mage/client/components/ability/BackgroundPainter.java b/Mage.Client/src/main/java/mage/client/components/ability/BackgroundPainter.java
index f374b2efcf6..d87f2c7057b 100644
--- a/Mage.Client/src/main/java/mage/client/components/ability/BackgroundPainter.java
+++ b/Mage.Client/src/main/java/mage/client/components/ability/BackgroundPainter.java
@@ -16,7 +16,7 @@ public class BackgroundPainter extends AbstractPainter {
 
     private final Color bgColor = Color.black;
 
-    final float bgalpha = 0.6f;
+    static final float bgalpha = 0.6f;
 
     public BackgroundPainter() {
         super();
diff --git a/Mage.Client/src/main/java/mage/client/components/ext/dlg/DialogContainer.java b/Mage.Client/src/main/java/mage/client/components/ext/dlg/DialogContainer.java
index bacdbd0956b..e0f6d37dac0 100644
--- a/Mage.Client/src/main/java/mage/client/components/ext/dlg/DialogContainer.java
+++ b/Mage.Client/src/main/java/mage/client/components/ext/dlg/DialogContainer.java
@@ -22,7 +22,7 @@ public class DialogContainer extends JPanel {
     private Color backgroundColor = new Color(0, 255, 255, 60);
     private int alpha = 50;
 
-    private final boolean isGradient = false;
+    private static final boolean isGradient = false;
     private final TexturePaint tp = null;
     private final Image gradient = null;
     private BufferedImage b;
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java
index 241dcc25e4b..64fdad50150 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java
@@ -62,7 +62,7 @@ public class DeckArea extends javax.swing.JPanel {
     private BigCard lastBigCard = null;
     private int dividerLocationNormal = 0;
     private int dividerLocationLimited = 0;
-    private final boolean isLimitedBuildingOrientation = false;
+    private static final boolean isLimitedBuildingOrientation = false;
 
     public DeckCardLayout getCardLayout() {
         return deckList.getCardLayout();
diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java
index 7807ba1e51f..dd6caba68c3 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java
@@ -86,8 +86,8 @@ public class NewTournamentDialog extends MageDialog {
     private JTextArea txtRandomPacks;
     private final List<TournamentPlayerPanel> players = new ArrayList<>();
     private final List<JComboBox> packs = new ArrayList<>();
-    private final int CONSTRUCTION_TIME_MIN = 6;
-    private final int CONSTRUCTION_TIME_MAX = 30;
+    private static final int CONSTRUCTION_TIME_MIN = 6;
+    private static final int CONSTRUCTION_TIME_MAX = 30;
     private boolean isRandom = false;
     private boolean isRichMan = false;
     private String cubeFromDeckFilename = "";
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java b/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java
index f41304525f4..3601348589c 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java
@@ -68,12 +68,12 @@ public class CardPluginImpl implements CardPlugin {
     private static final float STACK_SPACING_Y = 0.10f;
     private static final float ATTACHMENT_SPACING_Y = 0.13f;
 
-    private final int landStackMax = 5;
+    private static final int landStackMax = 5;
     // private int cardWidthMin = 50, cardWidthMax = Constants.CARD_SIZE_FULL.width;
     private int cardWidthMin = (int) GUISizeHelper.battlefieldCardMinDimension.getWidth();
     private int cardWidthMax = (int) GUISizeHelper.battlefieldCardMaxDimension.getWidth();
 
-    private final boolean stackVertical = false;
+    private static final boolean stackVertical = false;
 
     private int playAreaWidth, playAreaHeight;
     private int cardWidth, cardHeight;
diff --git a/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java b/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java
index a04bd2192d1..352591272a4 100644
--- a/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java
+++ b/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java
@@ -59,7 +59,7 @@ public class AbzanBattlePriest extends CardImpl {
         filter.add(new CounterPredicate(CounterType.P1P1));
     }
 
-    final String rule = "Each creature you control with a +1/+1 counter on it has lifelink";
+    static final String rule = "Each creature you control with a +1/+1 counter on it has lifelink";
 
     public AbzanBattlePriest(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}");
diff --git a/Mage.Sets/src/mage/cards/a/AinokBondKin.java b/Mage.Sets/src/mage/cards/a/AinokBondKin.java
index 7b852d1dd1a..2de64123d57 100644
--- a/Mage.Sets/src/mage/cards/a/AinokBondKin.java
+++ b/Mage.Sets/src/mage/cards/a/AinokBondKin.java
@@ -60,7 +60,7 @@ public class AinokBondKin extends CardImpl {
         filter.add(new CounterPredicate(CounterType.P1P1));
     }
 
-    final String rule = "Each creature you control with a +1/+1 counter on it has first strike";
+    static final String rule = "Each creature you control with a +1/+1 counter on it has first strike";
 
     public AinokBondKin(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}");
diff --git a/Mage.Sets/src/mage/cards/a/AquamorphEntity.java b/Mage.Sets/src/mage/cards/a/AquamorphEntity.java
index 51d592f3f48..fcb6eb219be 100644
--- a/Mage.Sets/src/mage/cards/a/AquamorphEntity.java
+++ b/Mage.Sets/src/mage/cards/a/AquamorphEntity.java
@@ -84,8 +84,8 @@ public class AquamorphEntity extends CardImpl {
 
 class AquamorphEntityReplacementEffect extends ReplacementEffectImpl {
 
-    private final String choice51 = "a 5/1 creature";
-    private final String choice15 = "a 1/5 creature";
+    private static final String choice51 = "a 5/1 creature";
+    private static final String choice15 = "a 1/5 creature";
 
     public AquamorphEntityReplacementEffect() {
         super(Duration.WhileOnBattlefield, Outcome.Benefit);
diff --git a/Mage.Sets/src/mage/cards/a/Aurification.java b/Mage.Sets/src/mage/cards/a/Aurification.java
index 866c3fc1eb0..5bd02eb70b8 100644
--- a/Mage.Sets/src/mage/cards/a/Aurification.java
+++ b/Mage.Sets/src/mage/cards/a/Aurification.java
@@ -64,7 +64,7 @@ public class Aurification extends CardImpl {
         filter.add(new CounterPredicate(CounterType.GOLD));
     }
 
-    final String rule = "Each creature with a gold counter on it is a Wall in addition to its other creature types and has defender.";
+    static final String rule = "Each creature with a gold counter on it is a Wall in addition to its other creature types and has defender.";
 
     public Aurification(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}{W}");
diff --git a/Mage.Sets/src/mage/cards/b/BalothPup.java b/Mage.Sets/src/mage/cards/b/BalothPup.java
index 69f482aca09..14f4b9f5b98 100644
--- a/Mage.Sets/src/mage/cards/b/BalothPup.java
+++ b/Mage.Sets/src/mage/cards/b/BalothPup.java
@@ -47,7 +47,7 @@ import mage.counters.CounterType;
  */
 public class BalothPup extends CardImpl {
 
-    private final String rule = "{this} has trample as long as it has a +1/+1 counter on it";
+    private static final String rule = "{this} has trample as long as it has a +1/+1 counter on it";
 
     public BalothPup(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}");
diff --git a/Mage.Sets/src/mage/cards/b/BladeTribeBerserkers.java b/Mage.Sets/src/mage/cards/b/BladeTribeBerserkers.java
index e182c6f8329..aa30f51f6dc 100644
--- a/Mage.Sets/src/mage/cards/b/BladeTribeBerserkers.java
+++ b/Mage.Sets/src/mage/cards/b/BladeTribeBerserkers.java
@@ -47,7 +47,7 @@ import mage.cards.CardSetInfo;
  */
 public class BladeTribeBerserkers extends CardImpl {
 
-    private final String effectText = "Metalcraft - When Blade-Tribe Berserkers enters the battlefield, if you control three or more artifacts, Blade-Tribe Berserkers gets +3/+3 and gains haste until end of turn.";
+    private static final String effectText = "Metalcraft - When Blade-Tribe Berserkers enters the battlefield, if you control three or more artifacts, Blade-Tribe Berserkers gets +3/+3 and gains haste until end of turn.";
 
     public BladeTribeBerserkers(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}");
diff --git a/Mage.Sets/src/mage/cards/b/BleakCovenVampires.java b/Mage.Sets/src/mage/cards/b/BleakCovenVampires.java
index e477af586a5..8ab4ec9bd95 100644
--- a/Mage.Sets/src/mage/cards/b/BleakCovenVampires.java
+++ b/Mage.Sets/src/mage/cards/b/BleakCovenVampires.java
@@ -47,7 +47,7 @@ import mage.target.TargetPlayer;
  */
 public class BleakCovenVampires extends CardImpl {
 
-    private final String effectText = "Metalcraft - When Bleak Coven Vampires enters the battlefield, if you control three or more artifacts, target player loses 4 life and you gain 4 life.";
+    private static final String effectText = "Metalcraft - When Bleak Coven Vampires enters the battlefield, if you control three or more artifacts, target player loses 4 life and you gain 4 life.";
 
     public BleakCovenVampires(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}");
diff --git a/Mage.Sets/src/mage/cards/c/CrabappleCohort.java b/Mage.Sets/src/mage/cards/c/CrabappleCohort.java
index 36a80ceaebe..7297d3dd091 100644
--- a/Mage.Sets/src/mage/cards/c/CrabappleCohort.java
+++ b/Mage.Sets/src/mage/cards/c/CrabappleCohort.java
@@ -51,7 +51,7 @@ import mage.filter.predicate.permanent.AnotherPredicate;
  */
 public class CrabappleCohort extends CardImpl {
 
-    private final String rule = "{this} gets +1/+1 as long as you control another green creature";
+    private static final String rule = "{this} gets +1/+1 as long as you control another green creature";
 
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent();
 
diff --git a/Mage.Sets/src/mage/cards/e/EldraziAggressor.java b/Mage.Sets/src/mage/cards/e/EldraziAggressor.java
index 2cd24343ac8..7c4edd78a9f 100644
--- a/Mage.Sets/src/mage/cards/e/EldraziAggressor.java
+++ b/Mage.Sets/src/mage/cards/e/EldraziAggressor.java
@@ -50,7 +50,7 @@ import mage.filter.predicate.permanent.AnotherPredicate;
  */
 public class EldraziAggressor extends CardImpl {
 
-    private final String rule = "{this} has haste as long as you control another colorless creature";
+    private static final String rule = "{this} has haste as long as you control another colorless creature";
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another colorless creature");
 
     static {
diff --git a/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java b/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java
index 889310efb28..7fd1e7cb37b 100644
--- a/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java
+++ b/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java
@@ -62,7 +62,7 @@ public class ExavaRakdosBloodWitch extends CardImpl {
         filter.add(new AnotherPredicate());
     }
 
-    final String rule = "Each other creature you control with a +1/+1 counter on it has haste";
+    static final String rule = "Each other creature you control with a +1/+1 counter on it has haste";
     public ExavaRakdosBloodWitch(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{R}");
         this.supertype.add("Legendary");
diff --git a/Mage.Sets/src/mage/cards/e/EzurisBrigade.java b/Mage.Sets/src/mage/cards/e/EzurisBrigade.java
index 7f00a9b9106..4d64ff2b745 100644
--- a/Mage.Sets/src/mage/cards/e/EzurisBrigade.java
+++ b/Mage.Sets/src/mage/cards/e/EzurisBrigade.java
@@ -49,7 +49,7 @@ import mage.cards.CardSetInfo;
  * @author Loki
  */
 public class EzurisBrigade extends CardImpl {
-    private final String text = "Metalcraft - As long as you control three or more artifacts, Ezuri's Brigade gets +4/+4 and has trample";
+    private static final String text = "Metalcraft - As long as you control three or more artifacts, Ezuri's Brigade gets +4/+4 and has trample";
 
     public EzurisBrigade (UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}");
diff --git a/Mage.Sets/src/mage/cards/g/GalvanicBlast.java b/Mage.Sets/src/mage/cards/g/GalvanicBlast.java
index 8828629e785..ac1d677110a 100644
--- a/Mage.Sets/src/mage/cards/g/GalvanicBlast.java
+++ b/Mage.Sets/src/mage/cards/g/GalvanicBlast.java
@@ -42,7 +42,7 @@ import mage.target.common.TargetCreatureOrPlayer;
  */
 public class GalvanicBlast extends CardImpl {
 
-    private final String effectText = "{this} deals 2 damage to target creature or player.<br>Metalcraft - {this} deals 4 damage to that creature or player instead if you control three or more artifacts";
+    private static final String effectText = "{this} deals 2 damage to target creature or player.<br>Metalcraft - {this} deals 4 damage to that creature or player instead if you control three or more artifacts";
 
     public GalvanicBlast(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{R}");
diff --git a/Mage.Sets/src/mage/cards/g/GhalmasWarden.java b/Mage.Sets/src/mage/cards/g/GhalmasWarden.java
index 163609db42f..36f58f3af12 100644
--- a/Mage.Sets/src/mage/cards/g/GhalmasWarden.java
+++ b/Mage.Sets/src/mage/cards/g/GhalmasWarden.java
@@ -47,7 +47,7 @@ import mage.cards.CardSetInfo;
  */
 public class GhalmasWarden extends CardImpl {
 
-    private final String text = "Metalcraft - Ghalma's Warden gets +2/+2 as long as you control three or more artifacts";
+    private static final String text = "Metalcraft - Ghalma's Warden gets +2/+2 as long as you control three or more artifacts";
 
     public GhalmasWarden (UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}");
diff --git a/Mage.Sets/src/mage/cards/g/GwyllionHedgeMage.java b/Mage.Sets/src/mage/cards/g/GwyllionHedgeMage.java
index 92d9c56e294..f62d5d8d3cd 100644
--- a/Mage.Sets/src/mage/cards/g/GwyllionHedgeMage.java
+++ b/Mage.Sets/src/mage/cards/g/GwyllionHedgeMage.java
@@ -60,8 +60,8 @@ public class GwyllionHedgeMage extends CardImpl {
         filter2.add(new SubtypePredicate("Swamp"));
     }
 
-    private final String rule1 = "When {this} enters the battlefield, if you control two or more Plains, you may create a 1/1 white Kithkin Soldier creature token.";
-    private final String rule2 = "When {this} enters the battlefield, if you control two or more Swamps, you may put a -1/-1 counter on target creature.";
+    private static final String rule1 = "When {this} enters the battlefield, if you control two or more Plains, you may create a 1/1 white Kithkin Soldier creature token.";
+    private static final String rule2 = "When {this} enters the battlefield, if you control two or more Swamps, you may put a -1/-1 counter on target creature.";
 
     public GwyllionHedgeMage(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W/B}");
diff --git a/Mage.Sets/src/mage/cards/h/HelixPinnacle.java b/Mage.Sets/src/mage/cards/h/HelixPinnacle.java
index 503d888d6ee..666c0de23b5 100644
--- a/Mage.Sets/src/mage/cards/h/HelixPinnacle.java
+++ b/Mage.Sets/src/mage/cards/h/HelixPinnacle.java
@@ -50,7 +50,7 @@ import mage.counters.CounterType;
  */
 public class HelixPinnacle extends CardImpl {
 
-    final String rule = "if there are 100 or more tower counters on Helix Pinnacle, you win the game";
+    static final String rule = "if there are 100 or more tower counters on Helix Pinnacle, you win the game";
 
     public HelixPinnacle(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}");
diff --git a/Mage.Sets/src/mage/cards/j/JorKadeenThePrevailer.java b/Mage.Sets/src/mage/cards/j/JorKadeenThePrevailer.java
index 648e6b815e4..97115d182e9 100644
--- a/Mage.Sets/src/mage/cards/j/JorKadeenThePrevailer.java
+++ b/Mage.Sets/src/mage/cards/j/JorKadeenThePrevailer.java
@@ -47,7 +47,7 @@ import mage.filter.common.FilterCreaturePermanent;
  */
 public class JorKadeenThePrevailer extends CardImpl {
 
-    private final String effectText = "Metalcraft - Creatures you control get +3/+0 as long as you control three or more artifacts.";
+    private static final String effectText = "Metalcraft - Creatures you control get +3/+0 as long as you control three or more artifacts.";
 
     public JorKadeenThePrevailer(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{W}");
diff --git a/Mage.Sets/src/mage/cards/m/MaliciousAffliction.java b/Mage.Sets/src/mage/cards/m/MaliciousAffliction.java
index df4cbd15f8f..b6c25fb0c7f 100644
--- a/Mage.Sets/src/mage/cards/m/MaliciousAffliction.java
+++ b/Mage.Sets/src/mage/cards/m/MaliciousAffliction.java
@@ -89,7 +89,7 @@ public class MaliciousAffliction extends CardImpl {
 
 class CopySourceSpellEffect extends OneShotEffect {
 
-    final String rule = "copy {this} and may choose a new target for the copy";
+    static final String rule = "copy {this} and may choose a new target for the copy";
 
     public CopySourceSpellEffect() {
         super(Outcome.Benefit);
diff --git a/Mage.Sets/src/mage/cards/m/MarkovCrusader.java b/Mage.Sets/src/mage/cards/m/MarkovCrusader.java
index 6c4e0959dec..397343d86cf 100644
--- a/Mage.Sets/src/mage/cards/m/MarkovCrusader.java
+++ b/Mage.Sets/src/mage/cards/m/MarkovCrusader.java
@@ -50,7 +50,7 @@ import mage.filter.predicate.permanent.AnotherPredicate;
  */
 public class MarkovCrusader extends CardImpl {
 
-    private final String rule = "{this} has haste as long as you control another Vampire";
+    private static final String rule = "{this} has haste as long as you control another Vampire";
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another Vampire");
 
     static {
diff --git a/Mage.Sets/src/mage/cards/m/MinotaurTactician.java b/Mage.Sets/src/mage/cards/m/MinotaurTactician.java
index 88cbf5db8f0..fdc67d745fb 100644
--- a/Mage.Sets/src/mage/cards/m/MinotaurTactician.java
+++ b/Mage.Sets/src/mage/cards/m/MinotaurTactician.java
@@ -60,9 +60,9 @@ public class MinotaurTactician extends CardImpl {
         filterBlue.add(new ColorPredicate(ObjectColor.BLUE));
     }
     
-    final private String ruleWhite = "{this} gets +1/+1 as long as you control another white creature";
+    static final private String ruleWhite = "{this} gets +1/+1 as long as you control another white creature";
     
-    final private String ruleBlue = "{this} gets +1/+1 as long as you control another white creature";
+    static final private String ruleBlue = "{this} gets +1/+1 as long as you control another white creature";
 
     public MinotaurTactician(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}");
diff --git a/Mage.Sets/src/mage/cards/m/MirranMettle.java b/Mage.Sets/src/mage/cards/m/MirranMettle.java
index 7b51994a9e3..325474d72e4 100644
--- a/Mage.Sets/src/mage/cards/m/MirranMettle.java
+++ b/Mage.Sets/src/mage/cards/m/MirranMettle.java
@@ -44,7 +44,7 @@ import mage.target.common.TargetCreaturePermanent;
  */
 public class MirranMettle extends CardImpl {
 
-    private final String effectText = "Metalcraft - That creature gets +4/+4 until end of turn instead if you control three or more artifacts.";
+    private static final String effectText = "Metalcraft - That creature gets +4/+4 until end of turn instead if you control three or more artifacts.";
 
     public MirranMettle(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{G}");
diff --git a/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java b/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java
index 51acecabca1..861f8857792 100644
--- a/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java
+++ b/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java
@@ -52,7 +52,7 @@ import mage.filter.predicate.permanent.AnotherPredicate;
  */
 public class MudbrawlerCohort extends CardImpl {
 
-    private final String rule = "{this} gets +1/+1 as long as you control another red creature";
+    private static final String rule = "{this} gets +1/+1 as long as you control another red creature";
 
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent();
 
diff --git a/Mage.Sets/src/mage/cards/n/Nefashu.java b/Mage.Sets/src/mage/cards/n/Nefashu.java
index 0ae167a103f..337cbaea4bf 100644
--- a/Mage.Sets/src/mage/cards/n/Nefashu.java
+++ b/Mage.Sets/src/mage/cards/n/Nefashu.java
@@ -45,7 +45,7 @@ import mage.target.common.TargetCreaturePermanent;
  */
 public class Nefashu extends CardImpl {
     
-    final String rule = "Whenever Nefashu attacks, up to five target creatures each get -1/-1 until end of turn.";
+    static final String rule = "Whenever Nefashu attacks, up to five target creatures each get -1/-1 until end of turn.";
 
     public Nefashu(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}");
diff --git a/Mage.Sets/src/mage/cards/o/OgreBattledriver.java b/Mage.Sets/src/mage/cards/o/OgreBattledriver.java
index 68f7953306c..87c1619b211 100644
--- a/Mage.Sets/src/mage/cards/o/OgreBattledriver.java
+++ b/Mage.Sets/src/mage/cards/o/OgreBattledriver.java
@@ -58,7 +58,7 @@ public class OgreBattledriver extends CardImpl {
         filter.add(new AnotherPredicate());
     }
     
-    private final String rule = "Whenever another creature enters the battlefield under your control, that creature gets +2/+0 and gains haste until end of turn.";
+    private static final String rule = "Whenever another creature enters the battlefield under your control, that creature gets +2/+0 and gains haste until end of turn.";
 
     public OgreBattledriver(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}");
diff --git a/Mage.Sets/src/mage/cards/p/PathOfBravery.java b/Mage.Sets/src/mage/cards/p/PathOfBravery.java
index 2ce7c94caa4..e4505cb9147 100644
--- a/Mage.Sets/src/mage/cards/p/PathOfBravery.java
+++ b/Mage.Sets/src/mage/cards/p/PathOfBravery.java
@@ -58,7 +58,7 @@ public class PathOfBravery extends CardImpl {
     static {
         filter.add(new ControllerPredicate(TargetController.YOU));
     }
-    final String rule = "As long as your life total is greater than or equal to your starting life total, creatures you control get +1/+1";
+    static final String rule = "As long as your life total is greater than or equal to your starting life total, creatures you control get +1/+1";
 
     public PathOfBravery(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}");
diff --git a/Mage.Sets/src/mage/cards/p/PrimalClay.java b/Mage.Sets/src/mage/cards/p/PrimalClay.java
index 63ae40ab358..41ab6ea2943 100644
--- a/Mage.Sets/src/mage/cards/p/PrimalClay.java
+++ b/Mage.Sets/src/mage/cards/p/PrimalClay.java
@@ -78,9 +78,9 @@ public class PrimalClay extends CardImpl {
 
     class PrimalPlasmaReplacementEffect extends ReplacementEffectImpl {
 
-        private final String choice33 = "a 3/3 artifact creature";
-        private final String choice22 = "a 2/2 artifact creature with flying";
-        private final String choice16 = "a 1/6 artifact creature with defender";
+        private static final String choice33 = "a 3/3 artifact creature";
+        private static final String choice22 = "a 2/2 artifact creature with flying";
+        private static final String choice16 = "a 1/6 artifact creature with defender";
 
         public PrimalPlasmaReplacementEffect() {
             super(Duration.WhileOnBattlefield, Outcome.Benefit);
diff --git a/Mage.Sets/src/mage/cards/p/PrimalForcemage.java b/Mage.Sets/src/mage/cards/p/PrimalForcemage.java
index 357cb28154d..3135f61f85b 100644
--- a/Mage.Sets/src/mage/cards/p/PrimalForcemage.java
+++ b/Mage.Sets/src/mage/cards/p/PrimalForcemage.java
@@ -55,7 +55,7 @@ public class PrimalForcemage extends CardImpl {
         filter.add(new AnotherPredicate());
     }
 
-    private final String rule = "Whenever another creature enters the battlefield under your control, that creature gets +3/+3 until end of turn.";
+    private static final String rule = "Whenever another creature enters the battlefield under your control, that creature gets +3/+3 until end of turn.";
 
     public PrimalForcemage(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}");
diff --git a/Mage.Sets/src/mage/cards/p/PrimalPlasma.java b/Mage.Sets/src/mage/cards/p/PrimalPlasma.java
index 7430610a195..a2b3642baa1 100644
--- a/Mage.Sets/src/mage/cards/p/PrimalPlasma.java
+++ b/Mage.Sets/src/mage/cards/p/PrimalPlasma.java
@@ -79,9 +79,9 @@ public class PrimalPlasma extends CardImpl {
 
     class PrimalPlasmaReplacementEffect extends ReplacementEffectImpl {
 
-        private final String choice33 = "a 3/3 creature";
-        private final String choice22 = "a 2/2 creature with flying";
-        private final String choice16 = "a 1/6 creature with defender";
+        private static final String choice33 = "a 3/3 creature";
+        private static final String choice22 = "a 2/2 creature with flying";
+        private static final String choice16 = "a 1/6 creature with defender";
 
         public PrimalPlasmaReplacementEffect() {
             super(Duration.WhileOnBattlefield, Outcome.Benefit);
diff --git a/Mage.Sets/src/mage/cards/r/RekindledFlame.java b/Mage.Sets/src/mage/cards/r/RekindledFlame.java
index 2b7af880e91..a9896973ca1 100644
--- a/Mage.Sets/src/mage/cards/r/RekindledFlame.java
+++ b/Mage.Sets/src/mage/cards/r/RekindledFlame.java
@@ -49,7 +49,7 @@ import mage.target.common.TargetCreatureOrPlayer;
  */
 public class RekindledFlame extends CardImpl {
     
-    final String rule = "if an opponent has no cards in hand, you may return Rekindled Flame from your graveyard to your hand";
+    static final String rule = "if an opponent has no cards in hand, you may return Rekindled Flame from your graveyard to your hand";
 
     public RekindledFlame(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R}{R}");
diff --git a/Mage.Sets/src/mage/cards/s/SapphireDrake.java b/Mage.Sets/src/mage/cards/s/SapphireDrake.java
index b36964cbe8b..aa7745234b7 100644
--- a/Mage.Sets/src/mage/cards/s/SapphireDrake.java
+++ b/Mage.Sets/src/mage/cards/s/SapphireDrake.java
@@ -56,7 +56,7 @@ public class SapphireDrake extends CardImpl {
         filter.add(new CounterPredicate(CounterType.P1P1));
     }
     
-    final String rule = "Each creature you control with a +1/+1 counter on it has flying";
+    static final String rule = "Each creature you control with a +1/+1 counter on it has flying";
 
     public SapphireDrake(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}");
diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java b/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java
index b9fe354afb8..bf3811a2ca7 100644
--- a/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java
+++ b/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java
@@ -62,7 +62,7 @@ public class ScourgeOfValkas extends CardImpl {
         filter2.add(new SubtypePredicate("Dragon"));
     }
     
-    private final String rule = "Whenever {this} or another Dragon enters the battlefield under your control, it deals X damage to target creature or player, where X is the number of Dragons you control.";
+    private static final String rule = "Whenever {this} or another Dragon enters the battlefield under your control, it deals X damage to target creature or player, where X is the number of Dragons you control.";
 
     public ScourgeOfValkas(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}{R}");
diff --git a/Mage.Sets/src/mage/cards/s/SelkieHedgeMage.java b/Mage.Sets/src/mage/cards/s/SelkieHedgeMage.java
index d4e9e0a1bc9..44b3aad991f 100644
--- a/Mage.Sets/src/mage/cards/s/SelkieHedgeMage.java
+++ b/Mage.Sets/src/mage/cards/s/SelkieHedgeMage.java
@@ -62,8 +62,8 @@ public class SelkieHedgeMage extends CardImpl {
         filter3.add(new TappedPredicate());
     }
 
-    private final String rule1 = "When {this} enters the battlefield, if you control two or more Forests, you may gain 3 life.";
-    private final String rule2 = "When {this} enters the battlefield, if you control two or more Islands, you may return target tapped creature to its owner's hand.";
+    private static final String rule1 = "When {this} enters the battlefield, if you control two or more Forests, you may gain 3 life.";
+    private static final String rule2 = "When {this} enters the battlefield, if you control two or more Islands, you may return target tapped creature to its owner's hand.";
 
     public SelkieHedgeMage(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G/U}");
diff --git a/Mage.Sets/src/mage/cards/s/ShepherdOfRot.java b/Mage.Sets/src/mage/cards/s/ShepherdOfRot.java
index 505e966230a..862cdcb19ba 100644
--- a/Mage.Sets/src/mage/cards/s/ShepherdOfRot.java
+++ b/Mage.Sets/src/mage/cards/s/ShepherdOfRot.java
@@ -47,7 +47,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
  */
 public class ShepherdOfRot extends CardImpl {
     
-    final String rule = "Each player loses 1 life for each Zombie on the battlefield";
+    static final String rule = "Each player loses 1 life for each Zombie on the battlefield";
     
     static final private FilterPermanent filter = new FilterPermanent("Zombie");
     
diff --git a/Mage.Sets/src/mage/cards/s/SpiralingDuelist.java b/Mage.Sets/src/mage/cards/s/SpiralingDuelist.java
index 5a0bda69499..da586f33f0d 100644
--- a/Mage.Sets/src/mage/cards/s/SpiralingDuelist.java
+++ b/Mage.Sets/src/mage/cards/s/SpiralingDuelist.java
@@ -47,7 +47,7 @@ import mage.cards.CardSetInfo;
  */
 public class SpiralingDuelist extends CardImpl {
 
-    private final String effectText = "Metalcraft - Spiraling Duelist has double strike as long as you control three or more artifacts.";
+    private static final String effectText = "Metalcraft - Spiraling Duelist has double strike as long as you control three or more artifacts.";
 
     public SpiralingDuelist(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}");
diff --git a/Mage.Sets/src/mage/cards/t/ThoughtHemorrhage.java b/Mage.Sets/src/mage/cards/t/ThoughtHemorrhage.java
index 9f4c965631c..fda4f611e9e 100644
--- a/Mage.Sets/src/mage/cards/t/ThoughtHemorrhage.java
+++ b/Mage.Sets/src/mage/cards/t/ThoughtHemorrhage.java
@@ -76,7 +76,7 @@ public class ThoughtHemorrhage extends CardImpl {
 
 class ThoughtHemorrhageEffect extends OneShotEffect {
 
-    final String rule = "Target player reveals his or her hand. {this} deals 3 damage to that player for each card with that name revealed this way. Search that player's graveyard, hand, and library for all cards with that name and exile them. Then that player shuffles his or her library";
+    static final String rule = "Target player reveals his or her hand. {this} deals 3 damage to that player for each card with that name revealed this way. Search that player's graveyard, hand, and library for all cards with that name and exile them. Then that player shuffles his or her library";
 
     public ThoughtHemorrhageEffect() {
         super(Outcome.Exile);
diff --git a/Mage.Sets/src/mage/cards/t/Thunderblust.java b/Mage.Sets/src/mage/cards/t/Thunderblust.java
index af59ae85b5c..9b30b9aa952 100644
--- a/Mage.Sets/src/mage/cards/t/Thunderblust.java
+++ b/Mage.Sets/src/mage/cards/t/Thunderblust.java
@@ -49,7 +49,7 @@ import mage.counters.CounterType;
  */
 public class Thunderblust extends CardImpl {
 
-    private final String rule = "{this} has trample as long as it has a -1/-1 counter on it";
+    private static final String rule = "{this} has trample as long as it has a -1/-1 counter on it";
 
     public Thunderblust(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}{R}");
diff --git a/Mage.Sets/src/mage/cards/t/TuskguardCaptain.java b/Mage.Sets/src/mage/cards/t/TuskguardCaptain.java
index f830132025f..021cce5dc82 100644
--- a/Mage.Sets/src/mage/cards/t/TuskguardCaptain.java
+++ b/Mage.Sets/src/mage/cards/t/TuskguardCaptain.java
@@ -60,7 +60,7 @@ public class TuskguardCaptain extends CardImpl {
         filter.add(new CounterPredicate(CounterType.P1P1));
     }
 
-    final String rule = "Each creature you control with a +1/+1 counter on it has trample";
+    static final String rule = "Each creature you control with a +1/+1 counter on it has trample";
 
     public TuskguardCaptain(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}");
diff --git a/Mage.Sets/src/mage/cards/w/WayOfTheThief.java b/Mage.Sets/src/mage/cards/w/WayOfTheThief.java
index 6b759ea81d3..16eed54fdb8 100644
--- a/Mage.Sets/src/mage/cards/w/WayOfTheThief.java
+++ b/Mage.Sets/src/mage/cards/w/WayOfTheThief.java
@@ -61,7 +61,7 @@ public class WayOfTheThief extends CardImpl {
     static {
         filter.add(new SubtypePredicate("Gate"));
     }    
-    private final String rule = "Enchanted creature can't be blocked as long as you control a Gate";
+    private static final String rule = "Enchanted creature can't be blocked as long as you control a Gate";
 
     public WayOfTheThief(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{U}");
diff --git a/Mage.Sets/src/mage/cards/w/WoodvineElemental.java b/Mage.Sets/src/mage/cards/w/WoodvineElemental.java
index e8a9f76a0b2..cb99f88a998 100644
--- a/Mage.Sets/src/mage/cards/w/WoodvineElemental.java
+++ b/Mage.Sets/src/mage/cards/w/WoodvineElemental.java
@@ -52,7 +52,7 @@ import mage.players.Player;
  */
 public class WoodvineElemental extends CardImpl {
     
-    final private String rule = "<i>Parley &mdash; </i> Whenever {this} attacks, each player reveals the top card of his or her library. " 
+    static final private String rule = "<i>Parley &mdash; </i> Whenever {this} attacks, each player reveals the top card of his or her library. "
                         + "For each nonland card revealed this way, attacking creatures you control get +1/+1 until end of turn. Then each player draws a card.";
     
     public WoodvineElemental(UUID ownerId, CardSetInfo setInfo) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/EpicEffect.java b/Mage/src/main/java/mage/abilities/effects/common/EpicEffect.java
index 48dd521d774..cd8e51617b0 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/EpicEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/EpicEffect.java
@@ -36,7 +36,7 @@ import java.util.Objects;
  */
 public class EpicEffect extends OneShotEffect {
 
-    final String rule = "<br>Epic <i>(For the rest of the game, you can't cast spells.  At the beginning of each of your upkeeps for the rest of the game, copy this spell except for its epic ability.  If the spell has targets, you may choose new targets for the copy)";
+    static final String rule = "<br>Epic <i>(For the rest of the game, you can't cast spells.  At the beginning of each of your upkeeps for the rest of the game, copy this spell except for its epic ability.  If the spell has targets, you may choose new targets for the copy)";
 
     public EpicEffect() {
         super(Outcome.Benefit);
diff --git a/Mage/src/main/java/mage/game/draft/DraftCube.java b/Mage/src/main/java/mage/game/draft/DraftCube.java
index bd64bfdd343..2aa75d0dfc2 100644
--- a/Mage/src/main/java/mage/game/draft/DraftCube.java
+++ b/Mage/src/main/java/mage/game/draft/DraftCube.java
@@ -74,7 +74,7 @@ public abstract class DraftCube {
     private static final Logger logger = Logger.getLogger(DraftCube.class);
 
     private final String name;
-    private final int boosterSize = 15;
+    private static final int boosterSize = 15;
 
     protected List<CardIdentity> cubeCards = new ArrayList<>();
     protected List<CardIdentity> leftCubeCards = new ArrayList<>();