diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index 085379d9..f8af1bf3 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -211,7 +211,7 @@
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
             <artifactId>batik-transcoder</artifactId>
-            <version>1.9.1</version>
+            <version>1.10</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -223,13 +223,8 @@
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
             <artifactId>batik-codec</artifactId>
-            <version>1.9.1</version>
+            <version>1.10</version>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>xml-apis</groupId>-->
-            <!--<artifactId>xml-apis</artifactId>-->
-            <!--<version>1.4.01</version>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java b/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java
index 64f7ef35..4fb7488f 100644
--- a/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java
@@ -48,7 +48,7 @@ public class ExportProperties {
         this.version = version;
     }
 
-    static public class GenericProperties extends ExportProperties {
+    private static class GenericProperties extends ExportProperties {
         private GenericProperties(ExportFormat format) {
             super(format);
         }
@@ -65,7 +65,7 @@ public class ExportProperties {
             this.size = size;
         }
 
-        public ImageProperties(ExportFormat format) {
+        ImageProperties(ExportFormat format) {
             super(format);
         }
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java b/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
index a2ffd1f8..47fc820b 100644
--- a/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
@@ -49,13 +49,14 @@ import javax.xml.transform.stream.StreamResult;
 import javax.xml.xpath.*;
 import java.awt.geom.AffineTransform;
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.regex.Pattern;
 
 public class ExporterFactory {
     private static final String GROUP_NODE_NAME = "g";
     private static final String IMAGE_NODE_NAME = "image";
-    public static final int MANGING = 50;
-    public static final String UTF_8_CHARSET_NAME = "UTF-8";
+    private static final int MANGING = 50;
+    private static final String UTF_8_CHARSET_NAME = "UTF-8";
     private File baseImgDir;
 
     public ExporterFactory(@NotNull final ServletContext servletContext) throws ParserConfigurationException {
@@ -82,16 +83,16 @@ public class ExporterFactory {
                 final String svgString = normalizeSvg(mapSvg);
                 final TranscoderInput input = new TranscoderInput(new CharArrayReader(svgString.toCharArray()));
 
-                TranscoderOutput trascoderOutput = new TranscoderOutput(output);
+                TranscoderOutput transcoderOutput = new TranscoderOutput(output);
 
                 // Save the image.
-                transcoder.transcode(input, trascoderOutput);
+                transcoder.transcode(input, transcoderOutput);
                 break;
             }
             case JPG: {
                 // Create a JPEG transcoder
                 final Transcoder transcoder = new JPEGTranscoder();
-                transcoder.addTranscodingHint(JPEGTranscoder.KEY_QUALITY, new Float(.99));
+                transcoder.addTranscodingHint(JPEGTranscoder.KEY_QUALITY, .99f);
 
                 final ExportProperties.ImageProperties imageProperties =
                         (ExportProperties.ImageProperties) properties;
@@ -123,22 +124,22 @@ public class ExporterFactory {
             }
             case SVG: {
                 final String svgString = normalizeSvg(mapSvg);
-                output.write(svgString.getBytes(UTF_8_CHARSET_NAME));
+                output.write(svgString.getBytes(StandardCharsets.UTF_8));
                 break;
             }
             case TEXT: {
                 final Exporter exporter = XSLTExporter.create(XSLTExporter.Type.TEXT);
-                exporter.export(xml.getBytes(UTF_8_CHARSET_NAME), output);
+                exporter.export(xml.getBytes(StandardCharsets.UTF_8), output);
                 break;
             }
             case OPEN_OFFICE_WRITER: {
                 final Exporter exporter = XSLTExporter.create(XSLTExporter.Type.OPEN_OFFICE);
-                exporter.export(xml.getBytes(UTF_8_CHARSET_NAME), output);
+                exporter.export(xml.getBytes(StandardCharsets.UTF_8), output);
                 break;
             }
             case MICROSOFT_EXCEL: {
                 final Exporter exporter = XSLTExporter.create(XSLTExporter.Type.MICROSOFT_EXCEL);
-                exporter.export(xml.getBytes(UTF_8_CHARSET_NAME), output);
+                exporter.export(xml.getBytes(StandardCharsets.UTF_8), output);
                 break;
             }
             case FREEMIND: {