diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/InitPropertyAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/InitPropertyAVM2Item.java
index ea9cc3b84..cc2f605fe 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/InitPropertyAVM2Item.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/InitPropertyAVM2Item.java
@@ -41,6 +41,7 @@ public class InitPropertyAVM2Item extends AVM2Item implements SetTypeAVM2Item, A
         return declaration;
     }
 
+    @Override
     public void setDeclaration(DeclarationAVM2Item declaration) {
         this.declaration = declaration;
     }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/SetLocalAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/SetLocalAVM2Item.java
index d6d64ab59..2d366517d 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/SetLocalAVM2Item.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/SetLocalAVM2Item.java
@@ -45,6 +45,7 @@ public class SetLocalAVM2Item extends AVM2Item implements SetTypeAVM2Item, Assig
         return declaration;
     }
 
+    @Override
     public void setDeclaration(DeclarationAVM2Item declaration) {
         this.declaration = declaration;
     }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/SetPropertyAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/SetPropertyAVM2Item.java
index 9934bee77..e3faef59f 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/SetPropertyAVM2Item.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/SetPropertyAVM2Item.java
@@ -49,6 +49,7 @@ public class SetPropertyAVM2Item extends AVM2Item implements SetTypeAVM2Item, As
         return declaration;
     }
 
+    @Override
     public void setDeclaration(DeclarationAVM2Item declaration) {
         this.declaration = declaration;
     }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSlotAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSlotAVM2Item.java
index fda54388f..da45cc47c 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSlotAVM2Item.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSlotAVM2Item.java
@@ -43,6 +43,7 @@ public class SetSlotAVM2Item extends AVM2Item implements SetTypeAVM2Item, Assign
         return declaration;
     }
 
+    @Override
     public void setDeclaration(DeclarationAVM2Item declaration) {
         this.declaration = declaration;
     }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LShiftAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LShiftAVM2Item.java
index 83953174e..b9f3ec153 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LShiftAVM2Item.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LShiftAVM2Item.java
@@ -19,13 +19,11 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations;
 import com.jpexs.decompiler.flash.SourceGeneratorLocalData;
 import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction;
 import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instructions;
-import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.graph.CompilationException;
 import com.jpexs.decompiler.graph.GraphSourceItem;
 import com.jpexs.decompiler.graph.GraphTargetItem;
 import com.jpexs.decompiler.graph.SourceGenerator;
 import com.jpexs.decompiler.graph.model.BinaryOpItem;
-import com.jpexs.decompiler.graph.model.LocalData;
 import com.jpexs.decompiler.graph.model.UnboundedTypeItem;
 import java.util.List;
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LeAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LeAVM2Item.java
index e37dcbf02..7d8d62bfc 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LeAVM2Item.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LeAVM2Item.java
@@ -22,7 +22,6 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instructions;
 import com.jpexs.decompiler.flash.ecma.EcmaScript;
 import com.jpexs.decompiler.flash.ecma.Undefined;
 import com.jpexs.decompiler.graph.CompilationException;
-import com.jpexs.decompiler.graph.DottedChain;
 import com.jpexs.decompiler.graph.GraphSourceItem;
 import com.jpexs.decompiler.graph.GraphTargetItem;
 import com.jpexs.decompiler.graph.SourceGenerator;
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java
index 922aa5b88..6971590a8 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java
@@ -21,11 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool;
 import com.jpexs.decompiler.flash.abc.avm2.model.NewFunctionAVM2Item;
 import com.jpexs.decompiler.flash.abc.types.AssignedValue;
 import com.jpexs.decompiler.flash.abc.types.ConvertData;
-import com.jpexs.decompiler.flash.abc.types.MethodInfo;
 import com.jpexs.decompiler.flash.abc.types.Multiname;
 import com.jpexs.decompiler.flash.abc.types.Namespace;
 import com.jpexs.decompiler.flash.abc.types.ValueKind;
-import static com.jpexs.decompiler.flash.abc.types.traits.Trait.TRAIT_GETTER;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
@@ -211,8 +209,8 @@ public class TraitSlotConst extends Trait implements TraitWithSlot {
 
         if (Configuration.handleSkinPartsAutomatically.get()) {
             /*
-                Hide: private static var _skinParts
-                (part of [SkinPart] compilations)
+             Hide: private static var _skinParts
+             (part of [SkinPart] compilations)
              */
             if (isStatic && "_skinParts".equals(getName(abc).getName(abc.constants, new ArrayList<>(), true))) {
                 if (kindType == Trait.TRAIT_SLOT) {
@@ -226,5 +224,4 @@ public class TraitSlotConst extends Trait implements TraitWithSlot {
         }
         return true;
     }
-
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java
index 8cb96d20b..d92ec7b7b 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java
@@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.action.model;
 import com.jpexs.decompiler.flash.IdentifiersDeobfuscation;
 import com.jpexs.decompiler.flash.SourceGeneratorLocalData;
 import com.jpexs.decompiler.flash.action.swf4.ActionGetVariable;
-import com.jpexs.decompiler.flash.ecma.Undefined;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.helpers.hilight.HighlightData;
 import com.jpexs.decompiler.graph.CompilationException;
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete.java
index 5a37bfba3..93f1b40a1 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete.java
@@ -18,10 +18,8 @@ package com.jpexs.decompiler.flash.action.swf5;
 
 import com.jpexs.decompiler.flash.BaseLocalData;
 import com.jpexs.decompiler.flash.action.Action;
-import com.jpexs.decompiler.flash.action.ActionScriptObject;
 import com.jpexs.decompiler.flash.action.LocalDataArea;
 import com.jpexs.decompiler.flash.action.model.DeleteActionItem;
-import com.jpexs.decompiler.flash.ecma.Undefined;
 import com.jpexs.decompiler.flash.types.annotations.SWFVersion;
 import com.jpexs.decompiler.graph.GraphSourceItem;
 import com.jpexs.decompiler.graph.GraphTargetItem;
@@ -48,11 +46,11 @@ public class ActionDelete extends Action {
     @Override
     public boolean execute(LocalDataArea lda) {
         /*        String memberName = lda.popAsString();
-        Object o = lda.pop();
-        if (o instanceof ActionScriptObject) {
-            ((ActionScriptObject) o).setMember(memberName, Undefined.INSTANCE);
-        }
-        return true;*/
+         Object o = lda.pop();
+         if (o instanceof ActionScriptObject) {
+         ((ActionScriptObject) o).setMember(memberName, Undefined.INSTANCE);
+         }
+         return true;*/
         return false;
     }
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/dumpview/DumpInfoSwfNode.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/dumpview/DumpInfoSwfNode.java
index 31f1f6944..ff71c5cbe 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/dumpview/DumpInfoSwfNode.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/dumpview/DumpInfoSwfNode.java
@@ -1,18 +1,19 @@
 /*
  *  Copyright (C) 2010-2016 JPEXS, All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3.0 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
 */
+ * License along with this library.
+ */
 package com.jpexs.decompiler.flash.dumpview;
 
 import com.jpexs.decompiler.flash.SWF;
@@ -30,6 +31,7 @@ public class DumpInfoSwfNode extends DumpInfo {
         this.swf = swf;
     }
 
+    @Override
     public SWF getSwf() {
         return swf;
     }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ecma/EcmaFloatingDecimal.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ecma/EcmaFloatingDecimal.java
index ac821924f..81fb79fd4 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ecma/EcmaFloatingDecimal.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ecma/EcmaFloatingDecimal.java
@@ -939,6 +939,7 @@ public class EcmaFloatingDecimal {
         }
     }
 
+    @Override
     public String toString() {
         // most brain-dead version
         StringBuffer result = new StringBuffer(nDigits + 8);
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ecma/EcmaType.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ecma/EcmaType.java
index e920b7944..3ac919634 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ecma/EcmaType.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ecma/EcmaType.java
@@ -1,23 +1,21 @@
 /*
  *  Copyright (C) 2010-2016 JPEXS, All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3.0 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.
  */
 package com.jpexs.decompiler.flash.ecma;
 
-import com.jpexs.decompiler.graph.model.Callable;
-
 /**
  *
  * @author JPEXS
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/PathExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/PathExporter.java
index fd4d55bee..4ea875fa8 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/PathExporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/PathExporter.java
@@ -23,7 +23,6 @@ import com.jpexs.decompiler.flash.types.GRADRECORD;
 import com.jpexs.decompiler.flash.types.RGB;
 import com.jpexs.decompiler.flash.types.SHAPE;
 import java.awt.BasicStroke;
-import java.awt.Shape;
 import java.awt.geom.GeneralPath;
 import java.util.ArrayList;
 import java.util.List;
@@ -35,7 +34,9 @@ import java.util.List;
 public class PathExporter extends ShapeExporterBase {
 
     private final List<GeneralPath> paths = new ArrayList<>();
+
     private final List<GeneralPath> strokes = new ArrayList<>();
+
     private double thickness = 0;
 
     private GeneralPath path = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/svg/SvgPathReader.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/svg/SvgPathReader.java
index 7a3365484..28e6fa9c8 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/svg/SvgPathReader.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/svg/SvgPathReader.java
@@ -22,7 +22,7 @@ package com.jpexs.decompiler.flash.importers.svg;
  */
 public class SvgPathReader {
 
-    private String str;
+    private final String str;
 
     private int pos;
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineScalingGridTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineScalingGridTag.java
index d97890a8e..057874e69 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineScalingGridTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineScalingGridTag.java
@@ -36,7 +36,6 @@ import java.awt.Shape;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.PathIterator;
-import java.awt.geom.Point2D;
 import java.io.IOException;
 
 /**
@@ -204,17 +203,17 @@ public class DefineScalingGridTag extends Tag implements CharacterIdTag {
         for (int i = 0; i < targetRect.length; i++) {
 
             /*          sourceRect[i].xMax = roundPixels20(sourceRect[i].xMax);
-            sourceRect[i].yMax = roundPixels20(sourceRect[i].yMax);
-            sourceRect[i].xMin = roundPixels20(sourceRect[i].xMin);
-            sourceRect[i].yMin = roundPixels20(sourceRect[i].yMin);
+             sourceRect[i].yMax = roundPixels20(sourceRect[i].yMax);
+             sourceRect[i].xMin = roundPixels20(sourceRect[i].xMin);
+             sourceRect[i].yMin = roundPixels20(sourceRect[i].yMin);
              */
             //System.out.println("source[" + i + "]=" + sourceRect[i]);
             //System.out.println("target[" + i + "]=" + targetRect[i]);
 
             /*targetRect[i].xMax = roundPixels20(targetRect[i].xMax);
-            targetRect[i].yMax = roundPixels20(targetRect[i].yMax);
-            targetRect[i].xMin = roundPixels20(targetRect[i].xMin);
-            targetRect[i].yMin = roundPixels20(targetRect[i].yMin);
+             targetRect[i].yMax = roundPixels20(targetRect[i].yMax);
+             targetRect[i].xMin = roundPixels20(targetRect[i].xMin);
+             targetRect[i].yMin = roundPixels20(targetRect[i].yMin);
              */
             transforms[i] = rectToRectMatrix(sourceRect[i], targetRect[i]);
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLXmlWriter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLXmlWriter.java
index 6fe990a49..908dcae97 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLXmlWriter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLXmlWriter.java
@@ -34,7 +34,7 @@ public class XFLXmlWriter implements XMLStreamWriter {
 
     private static final Logger logger = Logger.getLogger(XFLXmlWriter.class.getName());
 
-    private String newLineCharacters = "\n"; //Helper.newLine;
+    private final String newLineCharacters = "\n"; //Helper.newLine;
 
     private boolean newLine = true;
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphTargetItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphTargetItem.java
index 2045e2ff9..11c694626 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphTargetItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphTargetItem.java
@@ -25,7 +25,6 @@ import com.jpexs.decompiler.flash.abc.avm2.model.NewArrayAVM2Item;
 import com.jpexs.decompiler.flash.abc.avm2.model.NewObjectAVM2Item;
 import com.jpexs.decompiler.flash.abc.avm2.model.NullAVM2Item;
 import com.jpexs.decompiler.flash.abc.avm2.model.StringAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.ThisAVM2Item;
 import com.jpexs.decompiler.flash.abc.avm2.model.UndefinedAVM2Item;
 import com.jpexs.decompiler.flash.action.model.DirectValueActionItem;
 import com.jpexs.decompiler.flash.configuration.Configuration;
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/DuplicateItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/DuplicateItem.java
index 746016024..af1b9c929 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/DuplicateItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/DuplicateItem.java
@@ -24,7 +24,6 @@ import com.jpexs.decompiler.graph.GraphSourceItem;
 import com.jpexs.decompiler.graph.GraphTargetItem;
 import com.jpexs.decompiler.graph.SimpleValue;
 import com.jpexs.decompiler.graph.SourceGenerator;
-import com.jpexs.decompiler.graph.TypeItem;
 import java.util.List;
 import java.util.Set;
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java
index 3ee8f0552..0e9c0d69a 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java
@@ -16,7 +16,6 @@
  */
 package com.jpexs.decompiler.graph.model;
 
-import com.jpexs.decompiler.flash.abc.avm2.model.ThisAVM2Item;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.graph.GraphSourceItem;
 import com.jpexs.decompiler.graph.GraphSourceItemPos;
@@ -31,6 +30,7 @@ import java.util.Set;
 public abstract class UnaryOpItem extends GraphTargetItem implements UnaryOp {
 
     public String operator;
+
     protected String coerce;
 
     public UnaryOpItem(GraphSourceItem instruction, GraphSourceItem lineStartItem, int precedence, GraphTargetItem value, String operator, String coerce) {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/helpers/ReflectionTools.java b/libsrc/ffdec_lib/src/com/jpexs/helpers/ReflectionTools.java
index 182c367fc..67c6398a1 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/helpers/ReflectionTools.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/helpers/ReflectionTools.java
@@ -16,7 +16,6 @@
  */
 package com.jpexs.helpers;
 
-import com.jpexs.decompiler.flash.abc.avm2.AVM2Code;
 import com.jpexs.decompiler.flash.types.annotations.Internal;
 import com.jpexs.decompiler.flash.types.annotations.SWFField;
 import java.lang.reflect.Array;