diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUnaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUnaryExpression.java
index 50de75b5d7d..1fa885297a4 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUnaryExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUnaryExpression.java
@@ -41,7 +41,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.FunctionSetType;
 public class CPPASTUnaryExpression extends ASTNode implements ICPPASTUnaryExpression, IASTAmbiguityParent {
 	private int fOperator;
     private ICPPASTExpression fOperand;
-    private IASTImplicitName[] fImplicitNames = null;
+    private IASTImplicitName[] fImplicitNames;
 	private ICPPEvaluation fEvaluation;
 
     public CPPASTUnaryExpression() {
@@ -59,8 +59,8 @@ public class CPPASTUnaryExpression extends ASTNode implements ICPPASTUnaryExpres
 	
 	@Override
 	public CPPASTUnaryExpression copy(CopyStyle style) {
-		CPPASTUnaryExpression copy = new CPPASTUnaryExpression(fOperator, fOperand == null ? null
-				: fOperand.copy(style));
+		CPPASTUnaryExpression copy =
+				new CPPASTUnaryExpression(fOperator, fOperand == null ? null : fOperand.copy(style));
 		return copy(copy, style);
 	}
 
@@ -237,5 +237,4 @@ public class CPPASTUnaryExpression extends ASTNode implements ICPPASTUnaryExpres
 	public boolean isLValue() {
 		return getValueCategory() == LVALUE;
 	}
-
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/FlowInfo.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/FlowInfo.java
index f281f966363..85dd0c1b485 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/FlowInfo.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/FlowInfo.java
@@ -292,8 +292,9 @@ public abstract class FlowInfo {
 		// Must not consider return kind since a return statement can't control execution flow
 		// inside a method. It always leaves the method.
 		if (branches()) {
-			for (int i= 0; i < others.length; i++)
+			for (int i= 0; i < others.length; i++) {
 				others[i]= ACCESS_MODE_OPEN_BRANCH_TABLE[getIndex(others[i])];
+			}
 		}
 
 		if (fAccessModes == null) {	// all current variables are unused
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/InputFlowAnalyzer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/InputFlowAnalyzer.java
index 538954cbf00..1f882d25cb0 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/InputFlowAnalyzer.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/refactoring/code/flow/InputFlowAnalyzer.java
@@ -131,9 +131,9 @@ public class InputFlowAnalyzer extends FlowAnalyzer {
 				forInfo.mergeAction(actionInfo, fFlowContext);
 			} else {
 				// We have to merge two different cases. One if we reenter the for statement
-				// immediatelly (that means we have to consider increments, condition and action)
+				// immediately (that means we have to consider increments, condition and action)
 				// and the other case if we reenter the for in the next loop of
-				// the outer loop. Then we have to consider initializations, condtion and action.
+				// the outer loop. Then we have to consider initializations, condition and action.
 				// For a conditional flow info that means:
 				// (initializations | increments) & condition & action.
 				GenericConditionalFlowInfo initIncr= new GenericConditionalFlowInfo();