diff --git a/Examples/test-suite/doxygen_tricky_constructs.i b/Examples/test-suite/doxygen_misc_constructs.i
similarity index 100%
rename from Examples/test-suite/doxygen_tricky_constructs.i
rename to Examples/test-suite/doxygen_misc_constructs.i
diff --git a/Examples/test-suite/java/doxygen_tricky_constructs_runme.java b/Examples/test-suite/java/doxygen_misc_constructs_runme.java
similarity index 72%
rename from Examples/test-suite/java/doxygen_tricky_constructs_runme.java
rename to Examples/test-suite/java/doxygen_misc_constructs_runme.java
index bb4f69839..696f8b609 100644
--- a/Examples/test-suite/java/doxygen_tricky_constructs_runme.java
+++ b/Examples/test-suite/java/doxygen_misc_constructs_runme.java
@@ -1,12 +1,12 @@
 
-import doxygen_tricky_constructs.*;
+import doxygen_misc_constructs.*;
 import com.sun.javadoc.*;
 import java.util.HashMap;
 
-public class doxygen_tricky_constructs_runme {
+public class doxygen_misc_constructs_runme {
   static {
     try {
-      System.loadLibrary("doxygen_tricky_constructs");
+      System.loadLibrary("doxygen_misc_constructs");
     } catch (UnsatisfiedLinkError e) {
       System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
       System.exit(1);
@@ -20,18 +20,18 @@ public class doxygen_tricky_constructs_runme {
       and calls the start() method of that class with parsed information.
     */
 	commentParser parser = new commentParser();
-    com.sun.tools.javadoc.Main.execute("doxygen_tricky_constructs runtime test",
-	"commentParser", new String[]{"-quiet", "doxygen_tricky_constructs"});
+    com.sun.tools.javadoc.Main.execute("doxygen_misc_constructs runtime test",
+	"commentParser", new String[]{"-quiet", "doxygen_misc_constructs"});
 
     HashMap<String, String> wantedComments = new HashMap<String, String>();
     
-    wantedComments.put("doxygen_tricky_constructs.doxygen_tricky_constructs.getConnection()",
+    wantedComments.put("doxygen_misc_constructs.doxygen_misc_constructs.getConnection()",
     		" \n" +
     		" \n" +
     		" This class manages connection. \n" +
     		" \n" +
     		"");
-    wantedComments.put("doxygen_tricky_constructs.doxygen_tricky_constructs.getAddress(doxygen_tricky_constructs.SWIGTYPE_p_int, int)",
+    wantedComments.put("doxygen_misc_constructs.doxygen_misc_constructs.getAddress(doxygen_misc_constructs.SWIGTYPE_p_int, int)",
     		" Returns address of file line. \n" +
     		" \n" +
     		" @param fileName name of the file, where the source line is located \n" +
@@ -39,7 +39,7 @@ public class doxygen_tricky_constructs_runme {
     		" {@link Connection::getId()  }<br> \n" +
     		" \n" +
     		"");
-    wantedComments.put("doxygen_tricky_constructs.doxygen_tricky_constructs.getG_zipCode()",
+    wantedComments.put("doxygen_misc_constructs.doxygen_misc_constructs.getG_zipCode()",
     		" Tag endlink must be recognized also when it is the last token \n" +
     		" in the commment. \n" +
     		" \n" +
@@ -47,7 +47,7 @@ public class doxygen_tricky_constructs_runme {
     		" {@link debugIdeTraceProfilerCoverageSample.py Python example.  }\n" +
     		" \n" +
     		"");
-    wantedComments.put("doxygen_tricky_constructs.doxygen_tricky_constructs.setG_zipCode(int)",
+    wantedComments.put("doxygen_misc_constructs.doxygen_misc_constructs.setG_zipCode(int)",
     		" Tag endlink must be recognized also when it is the last token \n" +
     		" in the commment. \n" +
     		" \n" +
@@ -55,19 +55,19 @@ public class doxygen_tricky_constructs_runme {
     		" {@link debugIdeTraceProfilerCoverageSample.py Python example.  }\n" +
     		" \n" +
     		"");
-    wantedComments.put("doxygen_tricky_constructs.doxygen_tricky_constructs.getG_counter()",
+    wantedComments.put("doxygen_misc_constructs.doxygen_misc_constructs.getG_counter()",
     		" Tag endlink must be recognized also when followed by nonspace charater. \n" +
     		" \n" +
     		" {@link Connection::getId()  }<br> \n" +
     		" \n" +
     		"");
-    wantedComments.put("doxygen_tricky_constructs.doxygen_tricky_constructs.waitTime(int)",
+    wantedComments.put("doxygen_misc_constructs.doxygen_misc_constructs.waitTime(int)",
     		" Determines how long the <code>isystem.connect</code> should wait for running \n" +
     		" instances to respond. Only one of <code>lfWaitXXX</code> flags from IConnect::ELaunchFlags \n" +
     		" may be specified. \n" +
     		" \n" +
     		"");
-    wantedComments.put("doxygen_tricky_constructs.CConnectionConfig",
+    wantedComments.put("doxygen_misc_constructs.CConnectionConfig",
     		" This class contains information for connection to winIDEA. Its methods \n" +
     		" return reference to self, so we can use it like this: \n" +
     		" <pre> \n" +
@@ -82,7 +82,7 @@ public class doxygen_tricky_constructs_runme {
     		" {@link advancedWinIDEALaunching.py Python example.  }<br> \n" +
     		" \n" +
     		"");
-    wantedComments.put("doxygen_tricky_constructs.doxygen_tricky_constructs.getAddress(doxygen_tricky_constructs.SWIGTYPE_p_int, int, boolean)",
+    wantedComments.put("doxygen_misc_constructs.doxygen_misc_constructs.getAddress(doxygen_misc_constructs.SWIGTYPE_p_int, int, boolean)",
     		" Returns address of file line. \n" +
     		" \n" +
     		" @param fileName name of the file, where the source line is located \n" +
@@ -92,7 +92,7 @@ public class doxygen_tricky_constructs_runme {
     		" {@link Connection::getId()  }<br> \n" +
     		" \n" +
     		"");
-    wantedComments.put("doxygen_tricky_constructs.doxygen_tricky_constructs.setG_counter(char)",
+    wantedComments.put("doxygen_misc_constructs.doxygen_misc_constructs.setG_counter(char)",
     		" Tag endlink must be recognized also when followed by nonspace charater. \n" +
     		" \n" +
     		" {@link Connection::getId()  }<br> \n" +
diff --git a/Examples/test-suite/python/doxygen_tricky_constructs_runme.py b/Examples/test-suite/python/doxygen_misc_constructs_runme.py
similarity index 100%
rename from Examples/test-suite/python/doxygen_tricky_constructs_runme.py
rename to Examples/test-suite/python/doxygen_misc_constructs_runme.py
diff --git a/Source/DoxygenTranslator/src/DoxygenParser.cpp b/Source/DoxygenTranslator/src/DoxygenParser.cpp
index fd1acdc78..346e94cc2 100644
--- a/Source/DoxygenTranslator/src/DoxygenParser.cpp
+++ b/Source/DoxygenTranslator/src/DoxygenParser.cpp
@@ -103,23 +103,24 @@ bool DoxygenParser::isSectionIndicator(const std::string &smallString) {
 
 
 void DoxygenParser::printTree(const DoxygenEntityList &rootList) {
-	DoxygenEntityList::const_iterator p = rootList.begin();
-	while (p != rootList.end()) {
-		(*p).printEntity(0);
-		p++;
-	}
+  DoxygenEntityList::const_iterator p = rootList.begin();
+  while (p != rootList.end()) {
+    (*p).printEntity(0);
+    p++;
+  }
 }
 
 
 int DoxygenParser::commandBelongs(const std::string &theCommand) {
-	std::string smallString = stringToLower(theCommand);
-	//cout << " Looking for command " << theCommand << endl;
-	std::map<std::string, DoxyCommandEnum>::iterator it =
-	                                         doxygenCommands.find(smallString);
-	if (it != doxygenCommands.end()) {
-		return it->second;
-	}
-	return 0;
+
+  std::string smallString = stringToLower(theCommand);
+  //cout << " Looking for command " << theCommand << endl;
+  DoxyCommandsMapIt it = doxygenCommands.find(smallString);
+
+  if (it != doxygenCommands.end()) {
+    return it->second;
+  }
+  return 0;
 }
 
 
@@ -922,22 +923,11 @@ DoxygenParser::TokenList DoxygenParser::tokenizeDoxygenComment(const std::string
 
 
 void DoxygenParser::printList() {
-  TokenListIt p = m_tokenList.begin();
-  int i = 1;
-  int b = 0;
-  while (p != m_tokenList.end()) {
-    cout << (*p).toString() << " ";
-    b = i % TOKENSPERLINE;
-    if (b == 0)
-      cout << endl;
-    p++;
-    i++;
-  }
-
-  TokenListCIt startIt = m_tokenList.begin();
 
   int tokNo = 0;
-  for (TokenListCIt it = startIt; it != m_tokenList.end(); it++, tokNo++) {
+  for (TokenListCIt it = m_tokenList.begin(); it != m_tokenList.end();
+                                                              it++, tokNo++) {
+
     cout << it->toString() << " ";
 
     if ((tokNo % TOKENSPERLINE) == 0) {
@@ -946,6 +936,7 @@ void DoxygenParser::printList() {
   }
 }
 
+
 void DoxygenParser::printListError(int warningType,
                                         const std::string &message) {
   int curLine = m_fileLineNo;
diff --git a/Source/DoxygenTranslator/src/DoxygenParser.h b/Source/DoxygenTranslator/src/DoxygenParser.h
index e5fc5c06d..6e2c539ce 100644
--- a/Source/DoxygenTranslator/src/DoxygenParser.h
+++ b/Source/DoxygenTranslator/src/DoxygenParser.h
@@ -39,7 +39,6 @@ private:
   } DoxyCommandEnum;
 
 
-
   /** This class contains parts of Doxygen comment as a token. */
   class Token {
   public: