diff --git a/pom.xml b/pom.xml
index 395a686..d0ea812 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>librewsdl4j</groupId>
     <artifactId>libre-wsdl4j</artifactId>
-    <version>1.7.0</version>
+    <version>1.7.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>libre-wsdl4j</name>
@@ -80,4 +80,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/src/main/java/com/ibm/wsdl/extensions/http/HTTPUrlReplacementImpl.java b/src/main/java/com/ibm/wsdl/extensions/http/HTTPUrlReplacementImpl.java
index 3e48c25..efae16b 100644
--- a/src/main/java/com/ibm/wsdl/extensions/http/HTTPUrlReplacementImpl.java
+++ b/src/main/java/com/ibm/wsdl/extensions/http/HTTPUrlReplacementImpl.java
@@ -58,7 +58,7 @@ public Boolean getRequired()
 
   public String toString()
   {
-    StringBuffer strBuf = new StringBuffer();
+    StringBuilder strBuf = new StringBuilder();
 
     strBuf.append("HTTPUrlReplacement (" + elementType + "):");
     strBuf.append("\nrequired=" + required);
diff --git a/src/main/java/com/ibm/wsdl/extensions/schema/SchemaConstants.java b/src/main/java/com/ibm/wsdl/extensions/schema/SchemaConstants.java
index 254b9e6..7add924 100644
--- a/src/main/java/com/ibm/wsdl/extensions/schema/SchemaConstants.java
+++ b/src/main/java/com/ibm/wsdl/extensions/schema/SchemaConstants.java
@@ -40,7 +40,7 @@ public class SchemaConstants {
         new QName(NS_URI_XSD_2000, ELEM_SCHEMA);
     public static final QName Q_ELEM_XSD_2001 =
         new QName(NS_URI_XSD_2001, ELEM_SCHEMA);
-    public static final List XSD_QNAME_LIST = Arrays.asList(Q_ELEM_XSD_1999, Q_ELEM_XSD_2000, Q_ELEM_XSD_2001);
+    public static final List<QName> XSD_QNAME_LIST = Arrays.asList(Q_ELEM_XSD_1999, Q_ELEM_XSD_2000, Q_ELEM_XSD_2001);
     
     //Schema import qnames
     public static final QName Q_ELEM_IMPORT_XSD_1999 = new QName(
@@ -49,7 +49,7 @@ public class SchemaConstants {
         NS_URI_XSD_2000, Constants.ELEM_IMPORT);
     public static final QName Q_ELEM_IMPORT_XSD_2001 = new QName(
         NS_URI_XSD_2001, Constants.ELEM_IMPORT);
-    public static final List XSD_IMPORT_QNAME_LIST = Arrays.asList(Q_ELEM_IMPORT_XSD_1999, Q_ELEM_IMPORT_XSD_2000, Q_ELEM_IMPORT_XSD_2001);
+    public static final List<QName> XSD_IMPORT_QNAME_LIST = Arrays.asList(Q_ELEM_IMPORT_XSD_1999, Q_ELEM_IMPORT_XSD_2000, Q_ELEM_IMPORT_XSD_2001);
 
 
     //Schema include qnames
@@ -59,7 +59,7 @@ public class SchemaConstants {
         NS_URI_XSD_2000, ELEM_INCLUDE);
     public static final QName Q_ELEM_INCLUDE_XSD_2001 = new QName(
         NS_URI_XSD_2001, ELEM_INCLUDE);
-    public static final List XSD_INCLUDE_QNAME_LIST = Arrays.asList(Q_ELEM_INCLUDE_XSD_1999, Q_ELEM_INCLUDE_XSD_2000, Q_ELEM_INCLUDE_XSD_2001);
+    public static final List<QName> XSD_INCLUDE_QNAME_LIST = Arrays.asList(Q_ELEM_INCLUDE_XSD_1999, Q_ELEM_INCLUDE_XSD_2000, Q_ELEM_INCLUDE_XSD_2001);
 
     //Schema redefine qnames
     public static final QName Q_ELEM_REDEFINE_XSD_1999 = new QName(
@@ -68,7 +68,8 @@ public class SchemaConstants {
         NS_URI_XSD_2000, ELEM_REDEFINE);
     public static final QName Q_ELEM_REDEFINE_XSD_2001 = new QName(
 	    NS_URI_XSD_2001, ELEM_REDEFINE);
-    public static final List XSD_REDEFINE_QNAME_LIST = Arrays.asList(Q_ELEM_REDEFINE_XSD_1999, Q_ELEM_REDEFINE_XSD_2000, Q_ELEM_REDEFINE_XSD_2001);
-
+    public static final List<QName> XSD_REDEFINE_QNAME_LIST = Arrays.asList(Q_ELEM_REDEFINE_XSD_1999, Q_ELEM_REDEFINE_XSD_2000, Q_ELEM_REDEFINE_XSD_2001);
 
+    private SchemaConstants() {
+    }
 }
diff --git a/src/main/java/com/ibm/wsdl/extensions/schema/SchemaReferenceImpl.java b/src/main/java/com/ibm/wsdl/extensions/schema/SchemaReferenceImpl.java
index 6706deb..5f742a7 100644
--- a/src/main/java/com/ibm/wsdl/extensions/schema/SchemaReferenceImpl.java
+++ b/src/main/java/com/ibm/wsdl/extensions/schema/SchemaReferenceImpl.java
@@ -10,8 +10,7 @@
 /**
  * @author Jeremy Hughes <hughesj@uk.ibm.com>
  */
-public class SchemaReferenceImpl implements SchemaReference
-{
+public class SchemaReferenceImpl implements SchemaReference {
 
   public static final long serialVersionUID = 1;
 
@@ -24,48 +23,45 @@ public class SchemaReferenceImpl implements SchemaReference
   /**
    * @return Returns the id.
    */
-  public String getId()
-  {
+  public String getId() {
     return this.id;
   }
 
   /**
-   * @param id The id to set.
+   * @param id
+   *          The id to set.
    */
-  public void setId(String id)
-  {
+  public void setId(String id) {
     this.id = id;
   }
 
   /**
    * @return Returns the schemaLocation.
    */
-  public String getSchemaLocationURI()
-  {
+  public String getSchemaLocationURI() {
     return this.schemaLocation;
   }
 
   /**
-   * @param schemaLocation The schemaLocation to set.
+   * @param schemaLocation
+   *          The schemaLocation to set.
    */
-  public void setSchemaLocationURI(String schemaLocation)
-  {
+  public void setSchemaLocationURI(String schemaLocation) {
     this.schemaLocation = schemaLocation;
   }
 
   /**
    * @return Returns the importedSchema.
    */
-  public Schema getReferencedSchema()
-  {
+  public Schema getReferencedSchema() {
     return this.referencedSchema;
   }
 
   /**
-   * @param referencedSchema The importedSchema to set.
+   * @param referencedSchema
+   *          The importedSchema to set.
    */
-  public void setReferencedSchema(Schema referencedSchema)
-  {
+  public void setReferencedSchema(Schema referencedSchema) {
     this.referencedSchema = referencedSchema;
   }
 }
\ No newline at end of file
diff --git a/src/main/java/com/ibm/wsdl/extensions/soap/SOAPAddressImpl.java b/src/main/java/com/ibm/wsdl/extensions/soap/SOAPAddressImpl.java
index 7db59ea..68e2ce6 100644
--- a/src/main/java/com/ibm/wsdl/extensions/soap/SOAPAddressImpl.java
+++ b/src/main/java/com/ibm/wsdl/extensions/soap/SOAPAddressImpl.java
@@ -77,7 +77,7 @@ public String getLocationURI()
 
   public String toString()
   {
-    StringBuffer strBuf = new StringBuffer();
+    StringBuilder strBuf = new StringBuilder();
 
     strBuf.append("SOAPAddress (" + elementType + "):");
     strBuf.append("\nrequired=" + required);
diff --git a/src/main/java/com/ibm/wsdl/extensions/soap/SOAPBindingImpl.java b/src/main/java/com/ibm/wsdl/extensions/soap/SOAPBindingImpl.java
index 48fada7..3310eb2 100644
--- a/src/main/java/com/ibm/wsdl/extensions/soap/SOAPBindingImpl.java
+++ b/src/main/java/com/ibm/wsdl/extensions/soap/SOAPBindingImpl.java
@@ -99,7 +99,7 @@ public String getTransportURI()
 
   public String toString()
   {
-    StringBuffer strBuf = new StringBuffer();
+    StringBuilder strBuf = new StringBuilder();
 
     strBuf.append("SOAPBinding (" + elementType + "):");
     strBuf.append("\nrequired=" + required);
diff --git a/src/main/java/com/ibm/wsdl/extensions/soap/SOAPConstants.java b/src/main/java/com/ibm/wsdl/extensions/soap/SOAPConstants.java
index bcb0dcd..d1ea7e3 100644
--- a/src/main/java/com/ibm/wsdl/extensions/soap/SOAPConstants.java
+++ b/src/main/java/com/ibm/wsdl/extensions/soap/SOAPConstants.java
@@ -46,4 +46,6 @@ public class SOAPConstants
   public static final String ATTR_USE = "use";
   public static final String ATTR_ENCODING_STYLE = "encodingStyle";
   public static final String ATTR_PART = "part";
+
+  private SOAPConstants() {}
 }
\ No newline at end of file
diff --git a/src/main/java/com/ibm/wsdl/extensions/soap/SOAPOperationImpl.java b/src/main/java/com/ibm/wsdl/extensions/soap/SOAPOperationImpl.java
index 13e579a..2e77800 100644
--- a/src/main/java/com/ibm/wsdl/extensions/soap/SOAPOperationImpl.java
+++ b/src/main/java/com/ibm/wsdl/extensions/soap/SOAPOperationImpl.java
@@ -103,7 +103,7 @@ public String getStyle()
 
   public String toString()
   {
-    StringBuffer strBuf = new StringBuffer();
+    StringBuilder strBuf = new StringBuilder();
 
     strBuf.append("SOAPOperation (" + elementType + "):");
     strBuf.append("\nrequired=" + required);