diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java
index 7bd9bcc90ac..469f0e292dd 100644
--- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java
+++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java
@@ -18,15 +18,14 @@ import org.eclipse.core.runtime.IStatus;
  * @noextend This class is not intended to be subclassed by clients.
  */
 public class QualifiedTypeName implements IQualifiedTypeName {
-
-    private static final String[] NO_SEGMENTS = new String[0];
+    private static final String[] NO_SEGMENTS = {};
 	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
 	private static final int INITIAL_SEGMENT_LENGTH = 12;
 	private static final int HASH_INIT = 17;
     private static final int HASH_MULTIPLIER = 37;
 
     private String[] fSegments = NO_SEGMENTS;
-	private int fHashCode = 0;
+	private int fHashCode;
 
 	public static final QualifiedTypeName EMPTY = new QualifiedTypeName();
 
@@ -43,10 +42,11 @@ public class QualifiedTypeName implements IQualifiedTypeName {
 	}
 
 	public QualifiedTypeName(String name, String[] enclosingNames) {
-		if (enclosingNames == null)
+		if (enclosingNames == null) {
 		    fSegments = createSegments(name);
-		else
+		} else {
 		    fSegments = createSegments(name, enclosingNames);
+		}
 	}
 
 	private QualifiedTypeName() {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/NameWriter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/NameWriter.java
index 90e0e719ed9..a6af2b9e589 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/NameWriter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/NameWriter.java
@@ -98,14 +98,14 @@ public class NameWriter extends NodeWriter {
 		if (i <= 0){
 			return false;
 		}
-		if (qname.getNames()[i-1] instanceof ICPPASTTemplateId) {
+		if (qname.getNames()[i - 1] instanceof ICPPASTTemplateId) {
 			return true;
 		}
-		IBinding binding = qname.getNames()[i-1].resolveBinding();
+		IBinding binding = qname.getNames()[i - 1].resolveBinding();
 		if (binding instanceof CPPTemplateTypeParameter) {
 			return true;
 		}
-		return isDependentName(qname, tempId, i-1);
+		return isDependentName(qname, tempId, i - 1);
 	}
 
 	private boolean isNestedTemplateId(IASTNode node) {