diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DebugLogConstants.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DebugLogConstants.java
index 8b326ab6070..b6c74100de2 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DebugLogConstants.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DebugLogConstants.java
@@ -6,13 +6,11 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- * IBM Corporation - Initial API and implementation
+ *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.model;
 
-
 public enum DebugLogConstants {
-		
 	PARSER,
 	MODEL,
 	SCANNER,
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java
index 095698b0a63..3f2956646b5 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java
@@ -12,7 +12,6 @@
  *     IBM Corporation - EFS support
  *     Marc-Andre Laperle (Ericsson)
  *******************************************************************************/
-
 package org.eclipse.cdt.internal.core.model;
 
 import java.io.BufferedInputStream;
@@ -46,11 +45,11 @@ import org.osgi.service.prefs.Preferences;
 import com.ibm.icu.text.MessageFormat;
 
 public class Util implements ICLogConstants {
-	public static boolean VERBOSE_PARSER = false;
-	public static boolean VERBOSE_SCANNER = false;
-	public static boolean VERBOSE_MODEL = false;
-	public static boolean VERBOSE_DELTA = false;
-	public static boolean PARSER_EXCEPTIONS= false;
+	public static boolean VERBOSE_PARSER;
+	public static boolean VERBOSE_SCANNER;
+	public static boolean VERBOSE_MODEL;
+	public static boolean VERBOSE_DELTA;
+	public static boolean PARSER_EXCEPTIONS;
 
 	public static String LINE_SEPARATOR = System.getProperty("line.separator"); //$NON-NLS-1$
 
@@ -222,9 +221,9 @@ public class Util implements ICLogConstants {
 	public static boolean isActive(DebugLogConstants client) {
 		if (client.equals(DebugLogConstants.PARSER)) {
 			return VERBOSE_PARSER;
-		} else if (client.equals(DebugLogConstants.SCANNER))
+		} else if (client.equals(DebugLogConstants.SCANNER)) {
 			return VERBOSE_SCANNER;
-		else if (client.equals(DebugLogConstants.MODEL)) {
+		} else if (client.equals(DebugLogConstants.MODEL)) {
 			return VERBOSE_MODEL;
 		}
 		return false;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/AbstractParserLogService.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/AbstractParserLogService.java
index 98d8e3cc243..2771b5f165a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/AbstractParserLogService.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/AbstractParserLogService.java
@@ -6,9 +6,8 @@
  * 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.core.parser;
 
 import org.eclipse.cdt.internal.core.dom.parser.ParserLogServiceWrapper;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/DefaultLogService.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/DefaultLogService.java
index f8eec7539a5..6e5e11a2925 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/DefaultLogService.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/DefaultLogService.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- * IBM Rational Software - Initial API and implementation
+ *     IBM Rational Software - Initial API and implementation
  *******************************************************************************/
 package org.eclipse.cdt.core.parser;
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ParserLogServiceWrapper.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ParserLogServiceWrapper.java
index 9be074d33e4..ee4c1776b9c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ParserLogServiceWrapper.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ParserLogServiceWrapper.java
@@ -19,6 +19,7 @@ public class ParserLogServiceWrapper extends AbstractParserLogService {
 	public ParserLogServiceWrapper(IParserLogService log) {
 		fDelegate= log;
 	}
+
 	@Override
 	public boolean isTracing() {
 		return fDelegate.isTracing();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StdoutLogService.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StdoutLogService.java
index 7ecc1abe3e9..496f55262cc 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StdoutLogService.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StdoutLogService.java
@@ -6,50 +6,35 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- * IBM - Initial API and implementation
+ *     IBM - Initial API and implementation
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.indexer;
 
 import org.eclipse.cdt.core.parser.AbstractParserLogService;
 
 /**
- * @author crecoskie
- *
+ * Implementation of parser log service logging to stdout.
  */
-public class StdoutLogService extends AbstractParserLogService{
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.core.parser.AbstractParserLogService#errorLog(java.lang.String)
-	 */
+public class StdoutLogService extends AbstractParserLogService {
 	@Override
 	public void errorLog(String message) {
 		System.out.println("Parser Error Trace: " + message); //$NON-NLS-1$
 		System.out.flush();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.core.parser.AbstractParserLogService#isTracing()
-	 */
 	@Override
 	public boolean isTracing() {
 		return true;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.core.parser.AbstractParserLogService#isTracingExceptions()
-	 */
 	@Override
 	public boolean isTracingExceptions() {
 		return true;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.core.parser.AbstractParserLogService#traceLog(java.lang.String)
-	 */
 	@Override
 	public void traceLog(String message) {
 		System.out.println("Parser Trace: " + message); //$NON-NLS-1$
 		System.out.flush();
 	}
-
 }
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/parser/ParserLogService.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/parser/ParserLogService.java
index 7c09ff9db23..705a36d3034 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/parser/ParserLogService.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/parser/ParserLogService.java
@@ -6,9 +6,9 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    IBM Rational Software - Initial API and implementation
- *    Markus Schorn (Wind River Systems)
- *    Mike Kucera (IBM)
+ *     IBM Rational Software - Initial API and implementation
+ *     Markus Schorn (Wind River Systems)
+ *     Mike Kucera (IBM)
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.parser;