diff --git a/src/main/java/carcassonne/control/state/AbstractGameState.java b/src/main/java/carcassonne/control/state/AbstractGameState.java
index b4019bb..dcb5fbc 100644
--- a/src/main/java/carcassonne/control/state/AbstractGameState.java
+++ b/src/main/java/carcassonne/control/state/AbstractGameState.java
@@ -17,7 +17,7 @@
  */
 public abstract class AbstractGameState { // TODO (HIGH) [AI] separate human move states from AI moves?
 
-    private StateMachine stateMachine;
+    private final StateMachine stateMachine;
     protected GameSettings settings;
     protected ViewFacade views;
     protected Round round;
diff --git a/src/main/java/carcassonne/control/state/StateManning.java b/src/main/java/carcassonne/control/state/StateManning.java
index aa76ba7..a5e0903 100644
--- a/src/main/java/carcassonne/control/state/StateManning.java
+++ b/src/main/java/carcassonne/control/state/StateManning.java
@@ -17,7 +17,7 @@
  * @author Timur Saglam
  */
 public class StateManning extends AbstractGameState {
-    private boolean[] noMeeplesNotification;
+    private final boolean[] noMeeplesNotification;
 
     /**
      * Constructor of the state.
diff --git a/src/main/java/carcassonne/model/grid/GridPattern.java b/src/main/java/carcassonne/model/grid/GridPattern.java
index ce2de61..d7ddecc 100644
--- a/src/main/java/carcassonne/model/grid/GridPattern.java
+++ b/src/main/java/carcassonne/model/grid/GridPattern.java
@@ -22,8 +22,8 @@ public class GridPattern {
 
     private boolean disbursed;
     protected boolean complete;
-    private Map<Player, Integer> involvedPlayers;
-    private List<Meeple> meepleList;
+    private final Map<Player, Integer> involvedPlayers;
+    private final List<Meeple> meepleList;
     protected final TerrainType patternType;
     protected int scoreMultiplier;
     protected List<GridSpot> containedSpots;
diff --git a/src/main/java/carcassonne/view/main/MeepleLayer.java b/src/main/java/carcassonne/view/main/MeepleLayer.java
index db252de..51db4fa 100644
--- a/src/main/java/carcassonne/view/main/MeepleLayer.java
+++ b/src/main/java/carcassonne/view/main/MeepleLayer.java
@@ -22,12 +22,12 @@
  */
 public class MeepleLayer extends JPanel {
     private static final long serialVersionUID = -843137441362337953L;
-    private List<MeepleDepictionPanel> meeplePanels;
-    private MeepleDepictionPanel[][] meeplePanelGrid;
-    private JComponent[][] placeholderGrid;
+    private final List<MeepleDepictionPanel> meeplePanels;
+    private final MeepleDepictionPanel[][] meeplePanelGrid;
+    private final JComponent[][] placeholderGrid;
     private final List<RigidRectangle> placeholders;
     private int zoomLevel;
-    private ControllerFacade controller;
+    private final ControllerFacade controller;
 
     /**
      * Creates the meeple layer.
diff --git a/src/main/java/carcassonne/view/main/TileLayer.java b/src/main/java/carcassonne/view/main/TileLayer.java
index 6df6619..c7f2c4a 100644
--- a/src/main/java/carcassonne/view/main/TileLayer.java
+++ b/src/main/java/carcassonne/view/main/TileLayer.java
@@ -21,8 +21,8 @@
 public class TileLayer extends JPanel {
     private static final long serialVersionUID = 1503933201337556131L;
     private final List<TileDepiction> placementHighlights;
-    private List<TileDepiction> tileLabels;
-    private TileDepiction[][] tileDepictionGrid;
+    private final List<TileDepiction> tileLabels;
+    private final TileDepiction[][] tileDepictionGrid;
 
     /**
      * Creates the tile layer.