diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ToolFactory.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ToolFactory.java
index 04e26c65036..760359d4550 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ToolFactory.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ToolFactory.java
@@ -27,32 +27,31 @@ import org.eclipse.core.runtime.Platform;
  * @noinstantiate This class is not intended to be instantiated by clients.
  */
 public class ToolFactory {
-
 	/**
-	 * Create an instance of a code formatter. A code formatter implementation can be contributed via the
-	 * extension point "org.eclipse.cdt.core.CodeFormatter". If unable to find a registered extension, the factory
-	 * will default to using the default code formatter.
-	 * @param options - the options map to use for formatting with the code formatter. Recognized options
-	 * 	are documented on <code>DefaultCodeFormatterConstants</code>. If set to <code>null</code>, then use
-	 * 	the current settings from <code>CCorePlugin.getOptions()</code>.
+	 * Creates an instance of a code formatter. A code formatter implementation can be contributed
+	 * via the extension point "org.eclipse.cdt.core.CodeFormatter". If unable to find a registered
+	 * extension, the factory will default to using the default code formatter.
+	 * @param options - the options map to use for formatting with the code formatter. Recognized
+	 *     options are documented in {@link DefaultCodeFormatterConstants}. If set to {@code null},
+	 *     then use the current settings from {@code CCorePlugin.getOptions()}.
 	 * @return an instance of either a contributed the built-in code formatter
 	 * @see CodeFormatter
 	 * @see DefaultCodeFormatterConstants
 	 * @see CCorePlugin#getOptions()
 	 */
-	public static CodeFormatter createCodeFormatter(Map<String, ?> options){
+	public static CodeFormatter createCodeFormatter(Map<String, ?> options) {
 		if (options == null)
 			options = CCorePlugin.getOptions();
-		String formatterID = (String)options.get(CCorePreferenceConstants.CODE_FORMATTER);
+		String formatterID = (String) options.get(CCorePreferenceConstants.CODE_FORMATTER);
 		String extID = CCorePlugin.FORMATTER_EXTPOINT_ID;
 		IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(CCorePlugin.PLUGIN_ID, extID);
 		if (extension != null) {
 			IExtension[] extensions =  extension.getExtensions();
-			for (int i = 0; i < extensions.length; i++){
-				IConfigurationElement [] configElements = extensions[i].getConfigurationElements();
-				for (int j = 0; j < configElements.length; j++){
+			for (int i = 0; i < extensions.length; i++) {
+				IConfigurationElement[] configElements = extensions[i].getConfigurationElements();
+				for (int j = 0; j < configElements.length; j++) {
 					String initializerID = configElements[j].getAttribute("id"); //$NON-NLS-1$
-					if (initializerID != null && initializerID.equals(formatterID)){
+					if (initializerID != null && initializerID.equals(formatterID)) {
 						try {
 							Object execExt = configElements[j].createExecutableExtension("class"); //$NON-NLS-1$
 							if (execExt instanceof CodeFormatter){
@@ -72,19 +71,21 @@ public class ToolFactory {
 	}
 
 	/**
-	 * Create an instance of the built-in code formatter.
+	 * Creates an instance of the built-in code formatter.
 	 * 
-	 * @param options - the options map to use for formatting with the default code formatter. Recognized options
-	 * 	are documented on <code>DefaultCodeFormatterConstants</code>. If set to <code>null</code>, then use
-	 * 	the current settings from <code>CCorePlugin.getOptions()</code>.
+	 * @param options - the options map to use for formatting with the default code formatter.
+	 *     Recognized options are documented in {@link DefaultCodeFormatterConstants}. If set to
+	 *     {@code null}, then use the current settings from {@code CCorePlugin.getOptions()}.
 	 * @return an instance of the built-in code formatter
 	 * @see CodeFormatter
 	 * @see DefaultCodeFormatterConstants
 	 * @see CCorePlugin#getOptions()
 	 */
-	public static CodeFormatter createDefaultCodeFormatter(Map<String, ?> options){
+	public static CodeFormatter createDefaultCodeFormatter(Map<String, ?> options) {
 		if (options == null)
 			options = CCorePlugin.getOptions();
 		return new CCodeFormatter(options);
 	}
+
+	private ToolFactory() {}
 }