diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTQualifiedName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTQualifiedName.java
index 6492dd8ea83..4fd14d34f65 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTQualifiedName.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTQualifiedName.java
@@ -258,10 +258,12 @@ public class CPPASTQualifiedName extends CPPASTNameBase
 				break;
 			}
 		}
-		for (ICPPASTNameSpecifier nameSpecifier : getQualifier())
+		for (ICPPASTNameSpecifier nameSpecifier : getQualifier()) {
 			if (!nameSpecifier.accept(action))
 				return false;
-		// pointer-to-member qualified names have a dummy name as the last part of the name, don't visit it
+		}
+		// Pointer-to-member qualified names have a dummy name as the last part of the name,
+		// don't visit it.
 		if (fLastName != null && fLastName.getLookupKey().length > 0 && !fLastName.accept(action))
 			return false;
 		
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java
index eef19258fc3..5ede3ec2fa5 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java
@@ -70,7 +70,7 @@ import org.eclipse.cdt.internal.core.parser.util.ContentAssistMatcherFactory;
  * Base implementation for c++ scopes.
  */
 public class CPPClassScope extends CPPScope implements ICPPClassScope {
-    private ICPPMethod[] implicits = null;
+    private ICPPMethod[] implicits;
 
 	public CPPClassScope(ICPPASTCompositeTypeSpecifier physicalNode) {
 		super(physicalNode);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerToMemberType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerToMemberType.java
index 432601f7ed4..464cdd3c0c3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerToMemberType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerToMemberType.java
@@ -81,10 +81,11 @@ public class CPPPointerToMemberType extends CPPPointerType implements ICPPPointe
 				if (nameSpec instanceof ICPPASTQualifiedName) {
 					ICPPASTQualifiedName qname = ((ICPPASTQualifiedName) nameSpec);
 					ICPPASTNameSpecifier[] qualifier = qname.getQualifier();
-					if (qualifier.length > 0)
+					if (qualifier.length > 0) {
 						nameSpec = qualifier[qualifier.length - 1];
-					else 
-						nameSpec = (ICPPASTName) qname.getLastName(); 
+					} else { 
+						nameSpec = (ICPPASTName) qname.getLastName();
+					}
 				}
 				binding = nameSpec.resolvePreBinding();
 			}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPASTInternalScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPASTInternalScope.java
index bf05912d217..219b05ce954 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPASTInternalScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPASTInternalScope.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Markus Schorn - initial API and implementation
+ *     Markus Schorn - initial API and implementation
  *******************************************************************************/ 
 package org.eclipse.cdt.internal.core.dom.parser.cpp;
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/MethodContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/MethodContext.java
index dfddc218877..0d413a2c32b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/MethodContext.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/MethodContext.java
@@ -179,7 +179,7 @@ public class MethodContext {
 
 	private static ICPPClassType getClassBinding(ICPPASTQualifiedName qname) {
 		ICPPASTNameSpecifier classname = qname.getQualifier()[qname.getQualifier().length - 1];
-		ICPPClassType bind = (ICPPClassType)classname.resolveBinding();
+		ICPPClassType bind = (ICPPClassType) classname.resolveBinding();
 		return bind;
 	}