diff --git a/Mage.Client/src/main/java/mage/client/SessionHandler.java b/Mage.Client/src/main/java/mage/client/SessionHandler.java
index 74930a76df..f82c485e88 100644
--- a/Mage.Client/src/main/java/mage/client/SessionHandler.java
+++ b/Mage.Client/src/main/java/mage/client/SessionHandler.java
@@ -20,7 +20,7 @@ import mage.view.*;
/**
* Created by IGOUDT on 15-9-2016.
*/
-public class SessionHandler {
+public final class SessionHandler {
private static Session session;
diff --git a/Mage.Client/src/main/java/mage/client/chat/LocalCommands.java b/Mage.Client/src/main/java/mage/client/chat/LocalCommands.java
index ec854cad40..f7e03f4e9c 100644
--- a/Mage.Client/src/main/java/mage/client/chat/LocalCommands.java
+++ b/Mage.Client/src/main/java/mage/client/chat/LocalCommands.java
@@ -12,7 +12,7 @@ import java.util.Optional;
import java.util.StringTokenizer;
import java.util.UUID;
-public class LocalCommands {
+public final class LocalCommands {
private static final DateFormat timeFormatter = DateFormat.getTimeInstance(DateFormat.SHORT);
diff --git a/Mage.Client/src/main/java/mage/client/components/ext/TestMageFloatPane.java b/Mage.Client/src/main/java/mage/client/components/ext/TestMageFloatPane.java
index a8a684bc59..461ce022da 100644
--- a/Mage.Client/src/main/java/mage/client/components/ext/TestMageFloatPane.java
+++ b/Mage.Client/src/main/java/mage/client/components/ext/TestMageFloatPane.java
@@ -7,7 +7,7 @@ import javax.swing.*;
/**
* @author ayratn
*/
-public class TestMageFloatPane {
+public final class TestMageFloatPane {
public static void main(String... args) {
JFrame f = new JFrame();
diff --git a/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java b/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java
index 1da57aa847..ed73fbf9b6 100644
--- a/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java
+++ b/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java
@@ -52,7 +52,7 @@ import mage.util.TournamentUtil;
* @author nantuko
* @author Simown
*/
-public class DeckGenerator {
+public final class DeckGenerator {
public static class DeckGeneratorException extends RuntimeException {
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java
index 3e09760bb3..e3137ee353 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java
@@ -57,7 +57,7 @@ public final class CollectionViewerPanel extends JPanel {
private static final Logger logger = Logger.getLogger(CollectionViewerPanel.class);
protected static final String LAYOYT_CONFIG_KEY = "collectionViewerLayoutConfig";
- protected static final String FORMAT_CONFIG_KEY = "collectionViewerFormat";
+ private static final String FORMAT_CONFIG_KEY = "collectionViewerFormat";
public CollectionViewerPanel() {
initComponents();
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
index 89554efe22..1bad0df4a1 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
@@ -346,7 +346,7 @@ public class MageBook extends JComponent {
/**
* Defines the position of the next card on the mage book
*/
- private static class CardPosition {
+ private static final class CardPosition {
private CardPosition() {
}
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/table/CardHelper.java b/Mage.Client/src/main/java/mage/client/deckeditor/table/CardHelper.java
index 67126f9170..3fc60f7426 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/table/CardHelper.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/table/CardHelper.java
@@ -37,7 +37,7 @@ import mage.view.CardView;
*
* @author nantuko
*/
-public class CardHelper {
+public final class CardHelper {
private CardHelper() {
}
diff --git a/Mage.Client/src/main/java/mage/client/preference/MagePreferences.java b/Mage.Client/src/main/java/mage/client/preference/MagePreferences.java
index 64f200a28f..1566c8c5bf 100644
--- a/Mage.Client/src/main/java/mage/client/preference/MagePreferences.java
+++ b/Mage.Client/src/main/java/mage/client/preference/MagePreferences.java
@@ -8,7 +8,7 @@ import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
// TODO: Move all preference related logic from MageFrame and PreferencesDialog to this class.
-public class MagePreferences {
+public final class MagePreferences {
private static final String KEY_SERVER_ADDRESS = "serverAddress";
private static final String KEY_SERVER_PORT = "serverPort";
diff --git a/Mage.Client/src/main/java/mage/client/util/CardsViewUtil.java b/Mage.Client/src/main/java/mage/client/util/CardsViewUtil.java
index 7ab38acb40..70b69c2615 100644
--- a/Mage.Client/src/main/java/mage/client/util/CardsViewUtil.java
+++ b/Mage.Client/src/main/java/mage/client/util/CardsViewUtil.java
@@ -39,7 +39,7 @@ import mage.view.*;
*
* @author BetaSteward_at_googlemail.com
*/
-public class CardsViewUtil {
+public final class CardsViewUtil {
public static CardsView convertSimple(SimpleCardsView view) {
CardsView cards = new CardsView();
diff --git a/Mage.Client/src/main/java/mage/client/util/Config.java b/Mage.Client/src/main/java/mage/client/util/Config.java
index 910b7af07b..29a6b9b3f8 100644
--- a/Mage.Client/src/main/java/mage/client/util/Config.java
+++ b/Mage.Client/src/main/java/mage/client/util/Config.java
@@ -38,7 +38,7 @@ import org.apache.log4j.Logger;
*
* @author BetaSteward_at_googlemail.com
*/
-public class Config {
+public final class Config {
// TODO: Remove this class completely
private static final Logger logger = Logger.getLogger(Config.class);
diff --git a/Mage.Client/src/main/java/mage/client/util/DeckUtil.java b/Mage.Client/src/main/java/mage/client/util/DeckUtil.java
index a085522290..ba0ef5879f 100644
--- a/Mage.Client/src/main/java/mage/client/util/DeckUtil.java
+++ b/Mage.Client/src/main/java/mage/client/util/DeckUtil.java
@@ -41,7 +41,7 @@ import org.apache.log4j.Logger;
*
* @author nantuko
*/
-public class DeckUtil {
+public final class DeckUtil {
private static final Logger log = Logger.getLogger(DeckUtil.class);
diff --git a/Mage.Client/src/main/java/mage/client/util/Format.java b/Mage.Client/src/main/java/mage/client/util/Format.java
index 492c10f6ee..03fe6f057c 100644
--- a/Mage.Client/src/main/java/mage/client/util/Format.java
+++ b/Mage.Client/src/main/java/mage/client/util/Format.java
@@ -34,7 +34,7 @@ import java.util.Date;
*
* @author LevelX2
*/
-public class Format {
+public final class Format {
/**
* calculates the duration between two dates and returns a string in the format hhh:mm:ss
diff --git a/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java b/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java
index ea774ec703..790fe34e03 100644
--- a/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java
+++ b/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java
@@ -19,7 +19,7 @@ import org.mage.card.arcane.CardRenderer;
*
* @author LevelX2
*/
-public class GUISizeHelper {
+public final class GUISizeHelper {
// relate the native image card size to a value of the size scale
final static int CARD_IMAGE_WIDTH = 312;
diff --git a/Mage.Client/src/main/java/mage/client/util/IgnoreList.java b/Mage.Client/src/main/java/mage/client/util/IgnoreList.java
index 6c020518d0..8b0125dfd5 100644
--- a/Mage.Client/src/main/java/mage/client/util/IgnoreList.java
+++ b/Mage.Client/src/main/java/mage/client/util/IgnoreList.java
@@ -8,7 +8,7 @@ import mage.view.ChatMessage;
import java.util.Arrays;
import java.util.Set;
-public class IgnoreList {
+public final class IgnoreList {
private static final String USAGE = "
\\ignore - shows current ignore list on this server."
+ "
\\ignore [username] - add a username to your ignore list on this server."
diff --git a/Mage.Client/src/main/java/mage/client/util/ImageCaches.java b/Mage.Client/src/main/java/mage/client/util/ImageCaches.java
index 84a93a5f9f..c8676168f9 100644
--- a/Mage.Client/src/main/java/mage/client/util/ImageCaches.java
+++ b/Mage.Client/src/main/java/mage/client/util/ImageCaches.java
@@ -34,7 +34,7 @@ import java.util.Map;
*
* @author draxdyn
*/
-public class ImageCaches {
+public final class ImageCaches {
private final static ArrayList