diff --git a/src/com/jpexs/decompiler/flash/gui/DocsPanel.java b/src/com/jpexs/decompiler/flash/gui/DocsPanel.java
index e7dc0ab6c..690765bf7 100644
--- a/src/com/jpexs/decompiler/flash/gui/DocsPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/DocsPanel.java
@@ -31,7 +31,7 @@ import javax.swing.JScrollPane;
  */
 public class DocsPanel extends JPanel implements DocsListener {
 
-    private JEditorPane textDisplay = new JEditorPane();
+    private final JEditorPane textDisplay = new JEditorPane();
 
     public DocsPanel() {
         setLayout(new BorderLayout(0, 0));
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index 33b48a006..b4014e147 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -449,7 +449,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
 
         VariableNode root;
 
-        private Map<VariableNode, List<VariableNode>> nodeCache = new HashMap<>();
+        private final Map<VariableNode, List<VariableNode>> nodeCache = new HashMap<>();
 
         protected EventListenerList listenerList = new EventListenerList();
 
@@ -461,7 +461,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
 
         private static final int STRUCTURE_CHANGED = 3;
 
-        private MyTreeTable ttable;
+        private final MyTreeTable ttable;
 
         public VariablesTableModel(MyTreeTable ttable, List<Variable> vars, List<Long> parentIds) {
             this.ttable = ttable;
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanelSearchResult.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanelSearchResult.java
index 4b57228b6..516475876 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanelSearchResult.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanelSearchResult.java
@@ -24,7 +24,7 @@ import com.jpexs.decompiler.flash.abc.ScriptPack;
  */
 public class ABCPanelSearchResult {
 
-    private ScriptPack scriptPack;
+    private final ScriptPack scriptPack;
 
     public ABCPanelSearchResult(ScriptPack scriptPack) {
         this.scriptPack = scriptPack;
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java b/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java
index 6d9536391..1c1416933 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java
@@ -29,6 +29,7 @@ import com.jpexs.decompiler.flash.abc.types.Float4;
 import com.jpexs.decompiler.flash.abc.types.MethodBody;
 import com.jpexs.decompiler.flash.abc.types.traits.Trait;
 import com.jpexs.decompiler.flash.configuration.Configuration;
+import com.jpexs.decompiler.flash.docs.As3PCodeDocs;
 import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
 import com.jpexs.decompiler.flash.gui.GraphDialog;
 import com.jpexs.decompiler.flash.gui.View;
@@ -37,7 +38,6 @@ import com.jpexs.decompiler.flash.helpers.HighlightedText;
 import com.jpexs.decompiler.flash.helpers.HighlightedTextWriter;
 import com.jpexs.decompiler.flash.helpers.hilight.HighlightSpecialType;
 import com.jpexs.decompiler.flash.helpers.hilight.Highlighting;
-import com.jpexs.decompiler.flash.docs.As3PCodeDocs;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.decompiler.flash.tags.Tag;
 import com.jpexs.decompiler.graph.ScopeStack;
@@ -75,7 +75,7 @@ public class ASMSourceEditorPane extends DebuggableEditorPane implements CaretLi
 
     private List<Highlighting> specialHilights = new ArrayList<>();
 
-    private List<DocsListener> docsListeners = new ArrayList<>();
+    private final List<DocsListener> docsListeners = new ArrayList<>();
 
     private final DecompiledEditorPane decompiledEditor;
 
@@ -95,7 +95,7 @@ public class ASMSourceEditorPane extends DebuggableEditorPane implements CaretLi
 
     private int firstInstrLine = -1;
 
-    private Map<String, InstructionDefinition> insNameToDef = new HashMap<>();
+    private final Map<String, InstructionDefinition> insNameToDef = new HashMap<>();
 
     public void addDocsListener(DocsListener l) {
         docsListeners.add(l);
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java
index 7673d66e2..7f9e8b158 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java
@@ -82,7 +82,7 @@ public class DetailPanel extends JPanel implements TagEditorPanel {
 
     private boolean buttonsShouldBeShown = false;
 
-    private DebuggerHandler.ConnectionListener conListener;
+    private final DebuggerHandler.ConnectionListener conListener;
 
     public DetailPanel(ABCPanel abcPanel) {
         this.abcPanel = abcPanel;
diff --git a/src/com/jpexs/decompiler/flash/gui/action/ActionSearchResult.java b/src/com/jpexs/decompiler/flash/gui/action/ActionSearchResult.java
index a5b5f14bd..bdf71f7cb 100644
--- a/src/com/jpexs/decompiler/flash/gui/action/ActionSearchResult.java
+++ b/src/com/jpexs/decompiler/flash/gui/action/ActionSearchResult.java
@@ -24,9 +24,9 @@ import com.jpexs.decompiler.flash.tags.base.ASMSource;
  */
 public class ActionSearchResult {
 
-    private ASMSource src;
+    private final ASMSource src;
 
-    private String path;
+    private final String path;
 
     public ActionSearchResult(ASMSource src, String path) {
         this.src = src;
diff --git a/src/com/jpexs/decompiler/flash/gui/editor/LineMarkedEditorPane.java b/src/com/jpexs/decompiler/flash/gui/editor/LineMarkedEditorPane.java
index ab574b2b0..5fd03c1b4 100644
--- a/src/com/jpexs/decompiler/flash/gui/editor/LineMarkedEditorPane.java
+++ b/src/com/jpexs/decompiler/flash/gui/editor/LineMarkedEditorPane.java
@@ -80,14 +80,14 @@ public class LineMarkedEditorPane extends UndoFixedEditorPane implements LinkHan
 
     public static class LineMarker implements Comparable<LineMarker> {
 
-        private Color bgColor;
+        private final Color bgColor;
 
-        private Color color;
+        private final Color color;
 
         private FgPainter fgPainter;
 
         //private int line;
-        private int priority;
+        private final int priority;
 
         public FgPainter getForegroundPainter() {
             return fgPainter;
@@ -480,7 +480,7 @@ public class LineMarkedEditorPane extends UndoFixedEditorPane implements LinkHan
 
     public static class FgPainter extends DefaultHighlighter.DefaultHighlightPainter {
 
-        private SyntaxStyle fgStyle;
+        private final SyntaxStyle fgStyle;
 
         public FgPainter(Color color, Color bgColor) {
             super(bgColor);