diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterInsertEditProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterInsertEditProvider.java
index 6bea4d542ed..313ce814d32 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterInsertEditProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterInsertEditProvider.java
@@ -20,23 +20,19 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName;
 
 import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTQualifiedName;
 
-
 public class GetterSetterInsertEditProvider implements Comparable<GetterSetterInsertEditProvider>{
-	public enum Type{
+	public enum Type {
 		getter,
 		setter;
 	}
 	
-	
-	
 	private IASTSimpleDeclaration functionDeclaration;
 	private Type type;
 	private String name;
 	private IASTSimpleDeclaration fieldDeclaration;
 	
-	
-	public GetterSetterInsertEditProvider(String name, IASTSimpleDeclaration fieldDeclaration, Type type){
-		switch(type) {
+	public GetterSetterInsertEditProvider(String name, IASTSimpleDeclaration fieldDeclaration, Type type) {
+		switch (type) {
 		case getter:
 		
 			this.functionDeclaration = FunctionFactory.createGetterDeclaration(name, fieldDeclaration);
@@ -52,7 +48,7 @@ public class GetterSetterInsertEditProvider implements Comparable<GetterSetterIn
 	}
 	
 	@Override
-	public String toString(){
+	public String toString() {
 		IASTDeclarator declarator = functionDeclaration.getDeclarators()[0];
 		while (declarator.getNestedDeclarator() != null) {
 			declarator = declarator.getNestedDeclarator();
@@ -65,11 +61,11 @@ public class GetterSetterInsertEditProvider implements Comparable<GetterSetterIn
 		ICPPASTQualifiedName qname;
 		if(qualifedName) {
 			qname = getClassname();
-		}else {
+		} else {
 			qname = null;
 		}
 		
-		switch(type) {
+		switch (type) {
 		case getter:
 			definition = FunctionFactory.createGetterDefinition(name, fieldDeclaration, qname);
 			break;
@@ -103,6 +99,4 @@ public class GetterSetterInsertEditProvider implements Comparable<GetterSetterIn
 	public int compareTo(GetterSetterInsertEditProvider o) {
 		return toString().compareTo(o.toString());
 	}
-	
-	
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterLabelProvider.java
index d5a3dc510e5..927579fa0eb 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterLabelProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterLabelProvider.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html  
  * 
  * Contributors: 
- * Institute for Software (IFS)- initial API and implementation 
+ *     Institute for Software (IFS)- initial API and implementation 
  ******************************************************************************/
 package org.eclipse.cdt.internal.ui.refactoring.gettersandsetters;
 
@@ -20,16 +20,13 @@ import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider;
 
 /**
  * @author Emanuel Graf IFS
- *
  */
 public class GetterSetterLabelProvider extends LabelProvider {
 
 	@Override
 	public Image getImage(Object element) {
-		if(element != null) {
-			if (element instanceof GetterSetterInsertEditProvider) {
-				return CElementImageProvider.getMethodImageDescriptor(ASTAccessVisibility.PUBLIC).createImage();
-			}
+		if (element instanceof GetterSetterInsertEditProvider) {
+			return CElementImageProvider.getMethodImageDescriptor(ASTAccessVisibility.PUBLIC).createImage();
 		}
 		return null;
 	}