diff --git a/api-generator/generator-interfaces/src/main/java/esa/mo/tools/stubgen/specification/TypeUtils.java b/api-generator/generator-interfaces/src/main/java/esa/mo/tools/stubgen/specification/TypeUtils.java
index 12596010..a2e213f5 100644
--- a/api-generator/generator-interfaces/src/main/java/esa/mo/tools/stubgen/specification/TypeUtils.java
+++ b/api-generator/generator-interfaces/src/main/java/esa/mo/tools/stubgen/specification/TypeUtils.java
@@ -299,8 +299,7 @@ public static TypeRef getTypeViaXSDAny(Object any) {
 
                 return new TypeRef(newField);
             } else {
-                throw new IllegalArgumentException(
-                        "Unexpected XML type in message body of : " + re);
+                throw new IllegalArgumentException("Unexpected XML type in message body of : " + re);
             }
         } else {
             throw new IllegalArgumentException(
diff --git a/api-generator/generator-java/src/main/java/esa/mo/tools/stubgen/GeneratorGwt.java b/api-generator/generator-java/src/main/java/esa/mo/tools/stubgen/GeneratorGwt.java
index a2e83294..2ca83f1a 100644
--- a/api-generator/generator-java/src/main/java/esa/mo/tools/stubgen/GeneratorGwt.java
+++ b/api-generator/generator-java/src/main/java/esa/mo/tools/stubgen/GeneratorGwt.java
@@ -29,8 +29,6 @@
 import esa.mo.tools.stubgen.writers.ClassWriter;
 import esa.mo.tools.stubgen.writers.InterfaceWriter;
 import esa.mo.tools.stubgen.writers.MethodWriter;
-import esa.mo.xsd.AreaType;
-import esa.mo.xsd.ServiceType;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
@@ -84,9 +82,8 @@ protected void createServiceConsumerInterface(File consumerFolder, String area,
         file.addInterfaceOpenStatement(service + "GWT", "com.google.gwt.user.client.rpc.RemoteService", null);
 
         String throwsMALException = createElementType(StdStrings.MAL, null, null, StdStrings.MALEXCEPTION);
-        CompositeField msgType = createCompositeElementsDetails(file, false,
-                "return", TypeUtils.createTypeReference(StdStrings.MAL,
-                        TRANSPORT_FOLDER, StdStrings.MALMESSAGE, false),
+        CompositeField msgType = createCompositeElementsDetails(file, false, "return",
+                TypeUtils.createTypeReference(StdStrings.MAL, TRANSPORT_FOLDER, StdStrings.MALMESSAGE, false),
                 false, true, null);
 
         for (OperationSummary op : summary.getOperations()) {