diff --git a/src/main/java/org/sablecc/sablecc/Inlining.java b/src/main/java/org/sablecc/sablecc/Inlining.java
index 1f9ce31c6ca90f5507d7971f67736d252a355065..3874d6eb0faed22e1fea93ae4ce0736f5c2cb323 100644
--- a/src/main/java/org/sablecc/sablecc/Inlining.java
+++ b/src/main/java/org/sablecc/sablecc/Inlining.java
@@ -85,7 +85,7 @@ public class Inlining
       {
         listOfAlts.addAll( inlineAlternative(alts[i]) );
       }
-      /**************************************************************************
+      /*
       if( !containsDoubloons(listOfAlts) )
       {
        //list of productions whose inlining was a success.
@@ -95,7 +95,7 @@ public class Inlining
        return true;
       }
       return false;
-      /**************************************************************************/
+      //*/
       listOfAlts = removeAlternativeDoubloonsFromInlinedProduction(listOfAlts);
 
       //list of productions whose inlining was a success.
diff --git a/src/main/java/org/sablecc/sablecc/ResolveAltIds.java b/src/main/java/org/sablecc/sablecc/ResolveAltIds.java
index 13f9442bbf2afe2b74c03eefacab0dc60d576a72..fffb94f68e27068f8647d299c9d64531065f1efd 100644
--- a/src/main/java/org/sablecc/sablecc/ResolveAltIds.java
+++ b/src/main/java/org/sablecc/sablecc/ResolveAltIds.java
@@ -5,7 +5,7 @@
  * modification of SableCC.                                  *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-/**
+/*
  * Last Modification date : 03-11-2003
  * Remove the checking of question mark and + operator
  * for production tranformations
@@ -22,14 +22,11 @@ import org.sablecc.sablecc.node.*;
 import java.util.*;
 import java.io.*;
 
-/*
- * ResolveAltIds
- * 
+/**
  * This class computes semantic verifications for AST alternatives
  * section. The same thing is done by ResolveIds class for Productions
  * section.
  */
-
 public class ResolveAltIds extends DepthFirstAdapter
 {
   public ResolveIds ids;
diff --git a/src/main/java/org/sablecc/sablecc/ResolveAstIds.java b/src/main/java/org/sablecc/sablecc/ResolveAstIds.java
index 63e1f6b275f6306b058516f5b7111540a303290b..7daadc2be151003af5ef8500c4599d2a92e85627 100644
--- a/src/main/java/org/sablecc/sablecc/ResolveAstIds.java
+++ b/src/main/java/org/sablecc/sablecc/ResolveAstIds.java
@@ -13,15 +13,6 @@ import java.util.*;
 import java.io.*;
 
 /*
- * ResolveAstIds
- * 
- * This class computes basic semantic verifications for AST alternatives
- * section. The same thing is done by ResolveIds class for Productions
- * section. It makes sure that there is no conflictual names and it also
- * constructs few symbol tables necessary in the rest of the code.
- */
-
-/**
  * Last Modification date : 18-10-2004
  * correct AST alternative element error bug (error2()) 
  * Now only tokens and AST section's productions can be used in
@@ -32,6 +23,12 @@ import java.io.*;
  *
  */
 
+/**
+ * This class computes basic semantic verifications for AST alternatives
+ * section. The same thing is done by ResolveIds class for Productions
+ * section. It makes sure that there is no conflictual names and it also
+ * constructs few symbol tables necessary in the rest of the code.
+ */
 public class ResolveAstIds extends DepthFirstAdapter
 {
   //Map of AST productions. The AST production node can be obtained
diff --git a/src/main/java/org/sablecc/sablecc/ResolveProdTransformIds.java b/src/main/java/org/sablecc/sablecc/ResolveProdTransformIds.java
index 7a6f7a62fec8be3698e1781864a4bdf054bd3544..3f3bba2f673be7b1f1a4ab0184acd73d8dd89e57 100644
--- a/src/main/java/org/sablecc/sablecc/ResolveProdTransformIds.java
+++ b/src/main/java/org/sablecc/sablecc/ResolveProdTransformIds.java
@@ -129,7 +129,7 @@ public class ResolveProdTransformIds extends DepthFirstAdapter
                                         error3(node.getId(), "T" + name);
                                       }
 
-                                      /*****************************************************/
+                                      //*****************************************************
                                       String type_name = name;
                                       if( (node.getUnOp() instanceof AStarUnOp) ||
                                           (node.getUnOp() instanceof AQMarkUnOp) )
@@ -170,7 +170,7 @@ public class ResolveProdTransformIds extends DepthFirstAdapter
                                         error5(node.getId(), "P" + name);
                                       }
 
-                                      /*****************************************************/
+                                      //*****************************************************
                                       String type_name = name;
                                       if( (node.getUnOp() instanceof AStarUnOp) ||
                                           (node.getUnOp() instanceof AQMarkUnOp) )
@@ -226,7 +226,7 @@ public class ResolveProdTransformIds extends DepthFirstAdapter
                                         error4(node.getId(), "P" + name + " and T" + name);
                                       }
 
-                                      /*****************************************************/
+                                      //*****************************************************
                                       String type_name = name;
                                       if( (node.getUnOp() instanceof AStarUnOp) ||
                                           (node.getUnOp() instanceof AQMarkUnOp) )
@@ -268,7 +268,7 @@ public class ResolveProdTransformIds extends DepthFirstAdapter
                                         error5(node.getId(), node.getId().getText());
                                       }
 
-                                      /*****************************************************/
+                                      //*****************************************************
                                       String type_name = name;
                                       if( (node.getUnOp() instanceof AStarUnOp) ||
                                           (node.getUnOp() instanceof AQMarkUnOp) )