diff --git a/htroot/WikiHelp.html b/htroot/WikiHelp.html
index b1e2e4a43..5d4f03d5e 100644
--- a/htroot/WikiHelp.html
+++ b/htroot/WikiHelp.html
@@ -134,15 +134,6 @@
     </td>
    </tr>
 
-   <tr valign="top">
-    <td class="tt">
-     [= text =]
-    </td>
-    <td>
-     The escape tags will cause all tags in the text between the starting and the closing tag to not be treated as wiki-code.
-    </td>
-   </tr>
-
    <tr valign="top">
     <td class="tt">
      &lt;pre&gt; text &lt;/pre&gt;
diff --git a/source/de/anomic/data/wiki/wikiCode.java b/source/de/anomic/data/wiki/wikiCode.java
index 647c8d5b3..2e41b574d 100644
--- a/source/de/anomic/data/wiki/wikiCode.java
+++ b/source/de/anomic/data/wiki/wikiCode.java
@@ -24,7 +24,6 @@
 
 // Contains contributions from Alexander Schier [AS]
 // Franz Brausze [FB] and Marc Nause [MN]
-
 package de.anomic.data.wiki;
 
 import java.io.BufferedReader;
@@ -37,34 +36,35 @@ import de.anomic.htmlFilter.htmlFilterCharacterCoding;
 import de.anomic.server.serverCore;
 
 /** This class provides methods to handle texts that have been posted in the yacyWiki or other
-  * parts of YaCy that use this class, like the blog or the profile.
-  */
+ * parts of YaCy that use this class, like the blog or the profile.
+ */
 public class wikiCode extends abstractWikiParser implements wikiParser {
-    
+
     /* Table properties */
-    private static final String[] tps = { "rowspan", "colspan", "vspace", "hspace", "cellspacing", "cellpadding", "border" };
-    private static final HashMap/* <String,String[]> */<String, String[]> ps = new HashMap<String, String[]>();
+    private static final String[] tps = {"rowspan", "colspan", "vspace", "hspace", "cellspacing", "cellpadding", "border"};
+    private static final HashMap<String, String[]> ps = new HashMap<String, String[]>();
+
+
     static {
         Arrays.sort(tps);
         String[] array;
-        Arrays.sort(array = new String[] { "void", "above", "below", "hsides", "lhs", "rhs", "vsides", "box", "border" });
+        Arrays.sort(array = new String[]{"void", "above", "below", "hsides", "lhs", "rhs", "vsides", "box", "border"});
         ps.put("frame", array);
-        Arrays.sort(array = new String[] { "none", "groups", "rows", "cols", "all" });
+        Arrays.sort(array = new String[]{"none", "groups", "rows", "cols", "all"});
         ps.put("rules", array);
-        Arrays.sort(array = new String[] { "top", "middle", "bottom", "baseline" });
+        Arrays.sort(array = new String[]{"top", "middle", "bottom", "baseline"});
         ps.put("valign", array);
-        Arrays.sort(array = new String[] { "left", "right", "center" });
+        Arrays.sort(array = new String[]{"left", "right", "center"});
         ps.put("align", array);
     }
-    
-    private String numListLevel="";
-    private String ListLevel="";
-    private String defListLevel="";
-    private boolean cellprocessing=false;       //needed for prevention of double-execution of replaceHTML
+    private String numListLevel = "";
+    private String ListLevel = "";
+    private String defListLevel = "";
+    private boolean cellprocessing = false;     //needed for prevention of double-execution of replaceHTML
     private boolean defList = false;            //needed for definition lists
     private boolean escape = false;             //needed for escape
     private boolean escaped = false;            //needed for <pre> not getting in the way
-    private boolean newrowstart=false;          //needed for the first row not to be empty
+    private boolean newrowstart = false;        //needed for the first row not to be empty
     private boolean nolist = false;             //needed for handling of [= and <pre> in lists
     private boolean preformatted = false;       //needed for preformatted text
     private boolean preformattedSpan = false;   //needed for <pre> and </pre> spanning over several lines
@@ -74,26 +74,27 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
     private final ArrayList<String> dirElements = new ArrayList<String>();    //list of headlines used to create diectory of page
 
     /** Constructor of the class wikiCode */
-    public wikiCode(String address){
+    public wikiCode(String address) {
         super(address);
     }
-    
+
     protected String transform(
             final BufferedReader reader,
             final int length) throws IOException {
         final StringBuilder out = new StringBuilder(length);
         String line;
-        while ((line = reader.readLine()) != null)
+        while ((line = reader.readLine()) != null) {
             out.append(transformLine(line)).append(serverCore.CRLF_STRING);
+        }
         return out.insert(0, directory()).toString();
     }
 
     /** This method processes tables in the wiki code.
-      * @param a string that might contain parts of a table
-      * @return a string with wiki code of parts of table replaced by HTML code for table
-      */
-      //[FB], changes by [MN]
-    private String processTable(String result){
+     * @param a string that might contain parts of a table
+     * @return a string with wiki code of parts of table replaced by HTML code for table
+     */
+    //[FB], changes by [MN]
+    private String processTable(String result) {
         //some variables that make it easier to change codes for the table
         String line = "";
         final String tableStart = "&#123;&#124;";                 // {|
@@ -107,269 +108,261 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
         final int lenAttribDivider = attribDivider.length();
 
         if ((result.startsWith(tableStart)) && (!table)) {
-            table=true;
-            newrowstart=true;
-            line="<table";
-            if (result.trim().length()>lenTableStart) {
-                line+=parseTableProperties(result.substring(lenTableStart).trim()).toString();
+            table = true;
+            newrowstart = true;
+            line = "<table";
+            if (result.trim().length() > lenTableStart) {
+                line += parseTableProperties(result.substring(lenTableStart).trim()).toString();
             }
-            line+=">";
-            result=line;
-        }
-        else if (result.startsWith(newLine) && (table)) {          // new row
+            line += ">";
+            result = line;
+        } else if (result.startsWith(newLine) && (table)) {          // new row
             if (!newrowstart) {
-                line+="\t</tr>\n";
+                line += "\t</tr>\n";
             } else {
-                newrowstart=false;
+                newrowstart = false;
             }
-            line=line+"\t<tr>";
-            result=line;
-        }
-        else if ((result.startsWith(cellDivider)) && (table)) {
-            line+="\t\t<td";
-            final int cellEnd=(result.indexOf(cellDivider,lenCellDivider)>0)?(result.indexOf(cellDivider,lenCellDivider)):(result.length());
-            int propEnd = result.indexOf(attribDivider,lenCellDivider);
-            final int occImage = result.indexOf("[[Image:",lenCellDivider);
-            final int occEscape = result.indexOf("[=",lenCellDivider);
+            line = line + "\t<tr>";
+            result = line;
+        } else if ((result.startsWith(cellDivider)) && (table)) {
+            line += "\t\t<td";
+            final int cellEnd = (result.indexOf(cellDivider, lenCellDivider) > 0) ? (result.indexOf(cellDivider, lenCellDivider)) : (result.length());
+            int propEnd = result.indexOf(attribDivider, lenCellDivider);
+            final int occImage = result.indexOf("[[Image:", lenCellDivider);
+            final int occEscape = result.indexOf("[=", lenCellDivider);
             //If resultOf("[[Image:") is less than propEnd, that means that there is no
             //property for this cell, only an image. Without this, YaCy could get confused
             //by a | in [[Image:picture.png|alt-text]] or [[Image:picture.png|alt-text]]
             //Same for [= (part of [= =])
-            if((propEnd > lenCellDivider)
-            &&((occImage > propEnd)||( occImage < 0))
-            &&((occEscape> propEnd)||( occEscape < 0))
-            ){
-                propEnd = result.indexOf(attribDivider,lenCellDivider)+lenAttribDivider;
-            }
-            else {
+            if ((propEnd > lenCellDivider) && ((occImage > propEnd) || (occImage < 0)) && ((occEscape > propEnd) || (occEscape < 0))) {
+                propEnd = result.indexOf(attribDivider, lenCellDivider) + lenAttribDivider;
+            } else {
                 propEnd = cellEnd;
             }
             // both point at same place => new line
-            if (propEnd==cellEnd) {
-                propEnd=lenCellDivider;
-            }
-            else {
-                line+=parseTableProperties(result.substring(lenCellDivider,propEnd-lenAttribDivider).trim()).toString();
+            if (propEnd == cellEnd) {
+                propEnd = lenCellDivider;
+            } else {
+                line += parseTableProperties(result.substring(lenCellDivider, propEnd - lenAttribDivider).trim()).toString();
             }
             // quick&dirty fix [MN]
-            if(propEnd > cellEnd){
+            if (propEnd > cellEnd) {
                 propEnd = lenCellDivider;
             }
-            table=false; cellprocessing=true;
-            line+=">"+processTable(result.substring(propEnd,cellEnd).trim())+"</td>";
-            table=true; cellprocessing=false;
-            if (cellEnd<result.length()) {
-                line+="\n"+processTable(result.substring(cellEnd));
+            table = false;
+            cellprocessing = true;
+            line += ">" + processTable(result.substring(propEnd, cellEnd).trim()) + "</td>";
+            table = true;
+            cellprocessing = false;
+            if (cellEnd < result.length()) {
+                line += "\n" + processTable(result.substring(cellEnd));
             }
-            result=line;
-        }
-        else if (result.startsWith(tableEnd) && (table)) {          // Table end
-            table=false;
-            line+="\t</tr>\n</table>"+result.substring(lenTableEnd);
-            result=line;
+            result = line;
+        } else if (result.startsWith(tableEnd) && (table)) {          // Table end
+            table = false;
+            line += "\t</tr>\n</table>" + result.substring(lenTableEnd);
+            result = line;
         }
         return result;
     }
-    
+
     // contributed by [MN], changes by [FB]
     /** This method takes possible table properties and tests if they are valid.
-      * Valid in this case means if they are a property for the table, tr or td
-      * tag as stated in the HTML Pocket Reference by Jennifer Niederst (1st edition)
-      * The method is important to avoid XSS attacks on the wiki via table properties.
-      * @param properties A string that may contain several table properties and/or junk.
-      * @return A string that only contains table properties.
-      */
+     * Valid in this case means if they are a property for the table, tr or td
+     * tag as stated in the HTML Pocket Reference by Jennifer Niederst (1st edition)
+     * The method is important to avoid XSS attacks on the wiki via table properties.
+     * @param properties A string that may contain several table properties and/or junk.
+     * @return A string that only contains table properties.
+     */
     private static StringBuilder parseTableProperties(final String properties) {
         final String[] values = properties.replaceAll("&quot;", "").split("[= ]");     //splitting the string at = and blanks
         final StringBuilder sb = new StringBuilder(properties.length());
         String key, value;
         String[] posVals;
         final int numberofvalues = values.length;
-        for (int i=0; i<numberofvalues; i++) {
+        for (int i = 0; i < numberofvalues; i++) {
             key = values[i].trim();
             if (key.equals("nowrap")) {
                 addPair("nowrap", "nowrap", sb);
             } else if (i + 1 < numberofvalues) {
                 value = values[++i].trim();
-                if (
-                        (key.equals("summary")) ||
+                if ((key.equals("summary")) ||
                         (key.equals("bgcolor") && value.matches("#{0,1}[0-9a-fA-F]{1,6}|[a-zA-Z]{3,}")) ||
                         ((key.equals("width") || key.equals("height")) && value.matches("\\d+%{0,1}")) ||
                         ((posVals = ps.get(key)) != null && Arrays.binarySearch(posVals, value) >= 0) ||
-                        (Arrays.binarySearch(tps, key) >= 0 && value.matches("\\d+"))
-                ) {
+                        (Arrays.binarySearch(tps, key) >= 0 && value.matches("\\d+"))) {
                     addPair(key, value, sb);
                 }
             }
         }
         return sb;
     }
-    
+
     private static StringBuilder addPair(final String key, final String value, final StringBuilder sb) {
         return sb.append(" ").append(key).append("=\"").append(value).append("\"");
     }
 
     /** This method processes ordered lists.
-      */
-    private String orderedList(String result){
-        if(!nolist){    //lists only get processed if not forbidden (see code for [= and <pre>). [MN]
+     */
+    private String orderedList(String result) {
+        if (!nolist) {    //lists only get processed if not forbidden (see code for [= and <pre>). [MN]
             int p0 = 0;
             int p1 = 0;
             //# sorted Lists contributed by [AS]
             //## Sublist
-            if(result.startsWith(numListLevel + "#")){ //more #
+            if (result.startsWith(numListLevel + "#")) { //more #
                 p0 = result.indexOf(numListLevel);
                 p1 = result.length();
                 result = "<ol>" + serverCore.CRLF_STRING +
-                    "<li>" +
-                    result.substring(numListLevel.length() + 1, p1) +
-                    "</li>";
+                        "<li>" +
+                        result.substring(numListLevel.length() + 1, p1) +
+                        "</li>";
                 numListLevel += "#";
-            }else if(numListLevel.length() > 0 && result.startsWith(numListLevel)){ //equal number of #
+            } else if (numListLevel.length() > 0 && result.startsWith(numListLevel)) { //equal number of #
                 p0 = result.indexOf(numListLevel);
                 p1 = result.length();
                 result = "<li>" +
-                    result.substring(numListLevel.length(), p1) +
-                    "</li>";
-            }else if(numListLevel.length() > 0){ //less #
+                        result.substring(numListLevel.length(), p1) +
+                        "</li>";
+            } else if (numListLevel.length() > 0) { //less #
                 int i = numListLevel.length();
                 String tmp = "";
 
-                while(! result.startsWith(numListLevel.substring(0,i)) ){
+                while (!result.startsWith(numListLevel.substring(0, i))) {
                     tmp += "</ol>";
                     i--;
                 }
-                numListLevel = numListLevel.substring(0,i);
+                numListLevel = numListLevel.substring(0, i);
                 p0 = numListLevel.length();
                 p1 = result.length();
 
-                if(numListLevel.length() > 0){
+                if (numListLevel.length() > 0) {
                     result = tmp +
-                         "<li>" +
-                        result.substring(p0, p1) +
-                        "</li>";
-                }else{
+                            "<li>" +
+                            result.substring(p0, p1) +
+                            "</li>";
+                } else {
                     result = tmp + result.substring(p0, p1);
                 }
             }
-            // end contrib [AS]
+        // end contrib [AS]
         }
         return result;
     }
 
     /** This method processes unordered lists.
-      */
+     */
     //contributed by [AS] put into it's own method by [MN]
-    private String unorderedList(String result){
-        if(!nolist){    //lists only get processed if not forbidden (see code for [= and <pre>). [MN]
+    private String unorderedList(String result) {
+        if (!nolist) {    //lists only get processed if not forbidden (see code for [= and <pre>). [MN]
             int p0 = 0;
             int p1 = 0;
             //contributed by [AS]
-            if(result.startsWith(ListLevel + "*")){ //more stars
-               p0 = result.indexOf(ListLevel);
+            if (result.startsWith(ListLevel + "*")) { //more stars
+                p0 = result.indexOf(ListLevel);
                 p1 = result.length();
                 result = "<ul>" + serverCore.CRLF_STRING +
-                    "<li>" +
-                result.substring(ListLevel.length() + 1, p1) +
-                    "</li>";
+                        "<li>" +
+                        result.substring(ListLevel.length() + 1, p1) +
+                        "</li>";
                 ListLevel += "*";
-            }else if(ListLevel.length() > 0 && result.startsWith(ListLevel)){ //equal number of stars
+            } else if (ListLevel.length() > 0 && result.startsWith(ListLevel)) { //equal number of stars
                 p0 = result.indexOf(ListLevel);
                 p1 = result.length();
                 result = "<li>" +
-                    result.substring(ListLevel.length(), p1) +
-                    "</li>";
-            }else if(ListLevel.length() > 0){ //less stars
+                        result.substring(ListLevel.length(), p1) +
+                        "</li>";
+            } else if (ListLevel.length() > 0) { //less stars
                 int i = ListLevel.length();
                 String tmp = "";
 
-                while (ListLevel.length() >= i && !result.startsWith(ListLevel.substring(0,i))) {
+                while (ListLevel.length() >= i && !result.startsWith(ListLevel.substring(0, i))) {
                     tmp += "</ul>";
                     i--;
                 }
                 p0 = ListLevel.length();
                 if (i < p0) {
-                    ListLevel = ListLevel.substring(0,i);
+                    ListLevel = ListLevel.substring(0, i);
                     p0 = ListLevel.length();
                 }
                 p1 = result.length();
 
                 if (ListLevel.length() > 0) {
                     result = tmp +
-                        "<li>" +
-                        result.substring(p0, p1) +
-                        "</li>";
-                }else{
+                            "<li>" +
+                            result.substring(p0, p1) +
+                            "</li>";
+                } else {
                     result = tmp + result.substring(p0, p1);
                 }
             }
-            //end contrib [AS]
+        //end contrib [AS]
         }
         return result;
     }
 
     /** This method processes definition lists.
-      */
+     */
     //contributed by [MN] based on unordered list code by [AS]
-    private String definitionList(String result){
-        if(!nolist){    //lists only get processed if not forbidden (see code for [= and <pre>). [MN]
+    private String definitionList(String result) {
+        if (!nolist) {    //lists only get processed if not forbidden (see code for [= and <pre>). [MN]
             int p0 = 0;
             int p1 = 0;
-            if(result.startsWith(defListLevel + ";")){ //more semicolons
-                String dt = ""; 
+            if (result.startsWith(defListLevel + ";")) { //more semicolons
+                String dt = "";
                 String dd = "";
                 p0 = result.indexOf(defListLevel);
                 p1 = result.length();
                 final String resultCopy = result.substring(defListLevel.length() + 1, p1);
-                if((p0 = resultCopy.indexOf(":")) > 0){
-                    dt = resultCopy.substring(0,p0);
-                    dd = resultCopy.substring(p0+1);
+                if ((p0 = resultCopy.indexOf(":")) > 0) {
+                    dt = resultCopy.substring(0, p0);
+                    dd = resultCopy.substring(p0 + 1);
                     result = "<dl>" + "<dt>" + dt + "</dt>" + "<dd>" + dd;
                     defList = true;
                 }
                 defListLevel += ";";
-            }else if(defListLevel.length() > 0 && result.startsWith(defListLevel)){ //equal number of semicolons
-                String dt = ""; 
+            } else if (defListLevel.length() > 0 && result.startsWith(defListLevel)) { //equal number of semicolons
+                String dt = "";
                 String dd = "";
                 p0 = result.indexOf(defListLevel);
                 p1 = result.length();
                 final String resultCopy = result.substring(defListLevel.length(), p1);
-                if((p0 = resultCopy.indexOf(":")) > 0){
-                    dt = resultCopy.substring(0,p0);
-                    dd = resultCopy.substring(p0+1);
+                if ((p0 = resultCopy.indexOf(":")) > 0) {
+                    dt = resultCopy.substring(0, p0);
+                    dd = resultCopy.substring(p0 + 1);
                     result = "<dt>" + dt + "</dt>" + "<dd>" + dd;
                     defList = true;
                 }
-            }else if(defListLevel.length() > 0){ //less semicolons
-                String dt = ""; 
+            } else if (defListLevel.length() > 0) { //less semicolons
+                String dt = "";
                 String dd = "";
                 int i = defListLevel.length();
                 String tmp = "";
-                while(! result.startsWith(defListLevel.substring(0,i)) ){
+                while (!result.startsWith(defListLevel.substring(0, i))) {
                     tmp += "</dd></dl>";
                     i--;
                 }
-                defListLevel = defListLevel.substring(0,i);
+                defListLevel = defListLevel.substring(0, i);
                 p0 = defListLevel.length();
                 p1 = result.length();
-                if(defListLevel.length() > 0){
+                if (defListLevel.length() > 0) {
                     final String resultCopy = result.substring(p0, p1);
-                    if((p0 = resultCopy.indexOf(":")) > 0){
-                        dt = resultCopy.substring(0,p0);
-                        dd = resultCopy.substring(p0+1);
+                    if ((p0 = resultCopy.indexOf(":")) > 0) {
+                        dt = resultCopy.substring(0, p0);
+                        dd = resultCopy.substring(p0 + 1);
                         result = tmp + "<dt>" + dt + "</dt>" + "<dd>" + dd;
                         defList = true;
                     }
-                }else{
+                } else {
                     result = tmp + result.substring(p0, p1);
                 }
             }
         }
-        return result; 
+        return result;
     }
 
     /** This method processes links and images.
-      */
+     */
     //contributed by [AS] except where stated otherwise
     private String linksAndImages(String result) {
 
@@ -381,7 +374,9 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
         // internal links and images
         while ((p0 = result.indexOf("[[")) >= 0) {
             p1 = result.indexOf("]]", p0 + 2);
-            if (p1 <= p0) break;
+            if (p1 <= p0) {
+                break;
+            }
             kl = result.substring(p0 + 2, p1);
 
             // this is the part of the code that's responsible for images
@@ -401,21 +396,21 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
                         align = kv.substring(0, p);
                         //checking validity of value for align. Only non browser specific
                         //values get supported. Not supported: absmiddle, baseline, texttop
-                        if ((align.equals("bottom"))||
-                            (align.equals("center"))||
-                            (align.equals("left"))||
-                            (align.equals("middle"))||
-                            (align.equals("right"))||
-                            (align.equals("top")))
-                        {
+                        if ((align.equals("bottom")) ||
+                                (align.equals("center")) ||
+                                (align.equals("left")) ||
+                                (align.equals("middle")) ||
+                                (align.equals("right")) ||
+                                (align.equals("top"))) {
                             align = " align=\"" + align + "\"";
+                        } else {
+                            align = "";
                         }
-                        else align = "";
                         alt = " alt=\"" + kv.substring(p + 6) + "\"";
-                    }
-                    // if there is just one, put it into ALT
-                    else
+                    } // if there is just one, put it into ALT
+                    else {
                         alt = " alt=\"" + kv + "\"";
+                    }
                 }
 
                 // replace incomplete URLs and make them point to http://peerip:port/...
@@ -423,14 +418,12 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
                 // using the wikicode [[Image:share/yacy.gif]]
                 // or an image DATA/HTDOCS/grafics/kaskelix.jpg with [[Image:grafics/kaskelix.jpg]]
                 // you are free to use other sub-paths of DATA/HTDOCS
-                if (kl.indexOf("://")<1) {
+                if (kl.indexOf("://") < 1) {
                     kl = "http://" + super.address + "/" + kl;
                 }
 
                 result = result.substring(0, p0) + "<img src=\"" + kl + "\"" + align + alt + ">" + result.substring(p1 + 2);
-            }
-            // end contrib [MN]
-
+            } // end contrib [MN]
             // if it's no image, it might be an internal link
             else {
                 if ((p = kl.indexOf("&#124;")) > 0) {
@@ -446,13 +439,14 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
         // external links
         while ((p0 = result.indexOf("[")) >= 0) {
             p1 = result.indexOf("]", p0 + 1);
-            if (p1 <= p0) break;
+            if (p1 <= p0) {
+                break;
+            }
             kl = result.substring(p0 + 1, p1);
             if ((p = kl.indexOf(" ")) > 0) {
                 kv = kl.substring(p + 1);
                 kl = kl.substring(0, p);
-            }
-            // No text for the link? -> <a href="http://www.url.com/">http://www.url.com/</a>
+            } // No text for the link? -> <a href="http://www.url.com/">http://www.url.com/</a>
             else {
                 kv = kl;
             }
@@ -464,76 +458,70 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
             if (kl.indexOf("://") < 1) {
                 kl = "http://" + super.address + "/" + kl;
             }
-        result = result.substring(0, p0) + "<a class=\"extern\" href=\"" + kl + "\">" + kv + "</a>" + result.substring(p1 + 1);
+            result = result.substring(0, p0) + "<a class=\"extern\" href=\"" + kl + "\">" + kv + "</a>" + result.substring(p1 + 1);
         }
         return result;
     }
 
     /** This method handles the preformatted tags <pre> </pre> */
     //contributed by [MN]
-    private String preformattedTag(String result){
+    private String preformattedTag(String result) {
         int p0 = 0;
         int p1 = 0;
         //implementation very similar to escape code (see above)
         //both <pre> and </pre> in the same line
-        if(((p0=result.indexOf("&lt;pre&gt;"))>=0)&&((p1=result.indexOf("&lt;/pre&gt;"))>0)&&(!(escaped))){
-            if(p0<p1){
-                String preformattedText = "<pre style=\"border:dotted;border-width:thin\">"+result.substring(p0+11,p1)+"</pre>";
+        if (((p0 = result.indexOf("&lt;pre&gt;")) >= 0) && ((p1 = result.indexOf("&lt;/pre&gt;")) > 0) && (!(escaped))) {
+            if (p0 < p1) {
+                String preformattedText = "<pre style=\"border:dotted;border-width:thin\">" + result.substring(p0 + 11, p1) + "</pre>";
                 preformattedText = preformattedText.replaceAll("!pre!", "!pre!!");
-                result = transformLine(result.substring(0,p0).replaceAll("!pre!", "!pre!!")+"!pre!txt!"+result.substring(p1+12).replaceAll("!pre!", "!pre!!"));
+                result = transformLine(result.substring(0, p0).replaceAll("!pre!", "!pre!!") + "!pre!txt!" + result.substring(p1 + 12).replaceAll("!pre!", "!pre!!"));
                 result = result.replaceAll("!pre!txt!", preformattedText);
                 result = result.replaceAll("!pre!!", "!pre!");
-            }
-            //handles cases like <pre><pre> </pre></pre> <pre> </pre> that would cause an exception otherwise
-            else{
+            } //handles cases like <pre><pre> </pre></pre> <pre> </pre> that would cause an exception otherwise
+            else {
                 preformatted = true;
-                final String temp1 = transformLine(result.substring(0,p0-1).replaceAll("!tmp!","!tmp!!")+"!tmp!txt!");
+                final String temp1 = transformLine(result.substring(0, p0 - 1).replaceAll("!tmp!", "!tmp!!") + "!tmp!txt!");
                 nolist = true;
                 final String temp2 = transformLine(result.substring(p0));
                 nolist = false;
-                result = temp1.replaceAll("!tmp!txt!",temp2);
+                result = temp1.replaceAll("!tmp!txt!", temp2);
                 result = result.replaceAll("!tmp!!", "!tmp!");
                 preformatted = false;
             }
-        }
-
-        //start <pre>
-        else if(((p0 = result.indexOf("&lt;pre&gt;"))>=0)&&(!preformattedSpan)&&(!escaped)){
+        } //start <pre>
+        else if (((p0 = result.indexOf("&lt;pre&gt;")) >= 0) && (!preformattedSpan) && (!escaped)) {
             preformatted = true;    //prevent surplus line breaks
-            String bq ="";  //gets filled with <blockquote>s as needed
-            String preformattedText = "<pre style=\"border:dotted;border-width:thin\">"+result.substring(p0+11);
+            String bq = "";  //gets filled with <blockquote>s as needed
+            String preformattedText = "<pre style=\"border:dotted;border-width:thin\">" + result.substring(p0 + 11);
             preformattedText = preformattedText.replaceAll("!pre!", "!pre!!");
             //taking care of indented lines
-            while(result.substring(preindented,p0).startsWith(":")){
+            while (result.substring(preindented, p0).startsWith(":")) {
                 preindented++;
                 bq = bq + "<blockquote>";
             }
-            result = transformLine(result.substring(preindented,p0).replaceAll("!pre!", "!pre!!")+"!pre!txt!");
+            result = transformLine(result.substring(preindented, p0).replaceAll("!pre!", "!pre!!") + "!pre!txt!");
             result = bq + result.replaceAll("!pre!txt!", preformattedText);
             result = result.replaceAll("!pre!!", "!pre!");
             preformattedSpan = true;
-        }
-
-        //end </pre>
-        else if(((p0 = result.indexOf("&lt;/pre&gt;"))>=0)&&(preformattedSpan)&&(!escaped)){
+        } //end </pre>
+        else if (((p0 = result.indexOf("&lt;/pre&gt;")) >= 0) && (preformattedSpan) && (!escaped)) {
             preformattedSpan = false;
             String bq = ""; //gets filled with </blockquote>s as needed
-            String preformattedText = result.substring(0,p0)+"</pre>";
+            String preformattedText = result.substring(0, p0) + "</pre>";
             preformattedText = preformattedText.replaceAll("!pre!", "!pre!!");
-                //taking care of indented lines
-            while (preindented > 0){
+            //taking care of indented lines
+            while (preindented > 0) {
                 bq = bq + "</blockquote>";
                 preindented--;
             }
-            result = transformLine("!pre!txt!"+result.substring(p0+12).replaceAll("!pre!", "!pre!!"));
+            result = transformLine("!pre!txt!" + result.substring(p0 + 12).replaceAll("!pre!", "!pre!!"));
             result = result.replaceAll("!pre!txt!", preformattedText) + bq;
             result = result.replaceAll("!pre!!", "!pre!");
             preformatted = false;
-        }
-        //Getting rid of surplus </pre>
-        else if (((p0 = result.indexOf("&lt;/pre&gt;"))>=0)&&(!preformattedSpan)&&(!escaped)){
-            while((p0 = result.indexOf("&lt;/pre&gt;"))>=0){
-                result = result.substring(0,p0)+result.substring(p0+12);
+        } //Getting rid of surplus </pre>
+        else if (((p0 = result.indexOf("&lt;/pre&gt;")) >= 0) && (!preformattedSpan) && (!escaped)) {
+            while ((p0 = result.indexOf("&lt;/pre&gt;")) >= 0) {
+                result = result.substring(0, p0) + result.substring(p0 + 12);
             }
             result = transformLine(result);
         }
@@ -541,10 +529,10 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
     }
 
     /** This method creates a directory for a wiki page.
-      * @return directory of the wiki
-      */
+     * @return directory of the wiki
+     */
     //method contributed by [MN]
-    private String directory(){
+    private String directory() {
         String directory = "";
         String element;
         int s = 0;
@@ -556,136 +544,147 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
         String anchorext = "";
         if ((s = dirElements.size()) > 2) {
             for (int i = 0; i < s; i++) {
-            	if (i >= dirElements.size()) break;
+                if (i >= dirElements.size()) {
+                    break;
+                }
                 element = dirElements.get(i);
                 //counting double headlines
                 doubles = 0;
                 for (int j = 0; j < i; j++) {
-                	if (j >= dirElements.size()) break;
-                	String d = dirElements.get(j);
-                	if (d == null || d.length() < 1) continue;
-                	String a = d.substring(1).replaceAll(" ","_").replaceAll("[^a-zA-Z0-9_]","");
-                	String b = element.substring(1).replaceAll(" ","_").replaceAll("[^a-zA-Z0-9_]","");
-                    if (a.equals(b)) doubles++;
+                    if (j >= dirElements.size()) {
+                        break;
+                    }
+                    String d = dirElements.get(j);
+                    if (d == null || d.length() < 1) {
+                        continue;
+                    }
+                    String a = d.substring(1).replaceAll(" ", "_").replaceAll("[^a-zA-Z0-9_]", "");
+                    String b = element.substring(1).replaceAll(" ", "_").replaceAll("[^a-zA-Z0-9_]", "");
+                    if (a.equals(b)) {
+                        doubles++;
+                    }
                 }
                 //if there are doubles, create anchorextension
-                if(doubles>0){
-                    anchorext = "_" + (doubles+1);
+                if (doubles > 0) {
+                    anchorext = "_" + (doubles + 1);
                 }
 
-                if (element.startsWith("3")){
-                    if(level<3){
+                if (element.startsWith("3")) {
+                    if (level < 3) {
                         level = 3;
                         level3 = 0;
                     }
                     level3++;
                     final String temp = element.substring(1);
-                    element=level1+"."+level2+"."+level3+" "+temp;
-                    directory = directory + "&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"#"+temp.replaceAll(" ","_").replaceAll("[^a-zA-Z0-9_]","")+anchorext+"\" class=\"WikiTOC\">"+element+"</a><br />\n";
-                }
-                else if (element.startsWith("2")){
-                    if(level==1){
+                    element = level1 + "." + level2 + "." + level3 + " " + temp;
+                    directory = directory + "&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"#" + temp.replaceAll(" ", "_").replaceAll("[^a-zA-Z0-9_]", "") + anchorext + "\" class=\"WikiTOC\">" + element + "</a><br />\n";
+                } else if (element.startsWith("2")) {
+                    if (level == 1) {
                         level2 = 0;
                         level = 2;
                     }
-                    if(level==3){
+                    if (level == 3) {
                         level = 2;
                     }
                     level2++;
                     final String temp = element.substring(1);
-                    element=level1+"."+level2+" "+temp;
-                    directory = directory + "&nbsp;&nbsp;<a href=\"#"+temp.replaceAll(" ","_").replaceAll("[^a-zA-Z0-9_]","")+anchorext+"\" class=\"WikiTOC\">"+element+"</a><br />\n";
-                }
-                else if (element.startsWith("1")) {
-                    if (level>1) {
+                    element = level1 + "." + level2 + " " + temp;
+                    directory = directory + "&nbsp;&nbsp;<a href=\"#" + temp.replaceAll(" ", "_").replaceAll("[^a-zA-Z0-9_]", "") + anchorext + "\" class=\"WikiTOC\">" + element + "</a><br />\n";
+                } else if (element.startsWith("1")) {
+                    if (level > 1) {
                         level = 1;
                         level2 = 0;
                         level3 = 0;
                     }
                     level1++;
                     final String temp = element.substring(1);
-                    element=level1+". "+temp;
-                    directory = directory + "<a href=\"#"+temp.replaceAll(" ","_").replaceAll("[^a-zA-Z0-9_]","")+anchorext+"\" class=\"WikiTOC\">"+element+"</a><br />\n";
+                    element = level1 + ". " + temp;
+                    directory = directory + "<a href=\"#" + temp.replaceAll(" ", "_").replaceAll("[^a-zA-Z0-9_]", "") + anchorext + "\" class=\"WikiTOC\">" + element + "</a><br />\n";
                 }
-                anchorext="";
+                anchorext = "";
             }
             directory = "<table><tr><td><div class=\"WikiTOCBox\">\n" + directory + "</div></td></tr></table>\n";
         }
         // [MN]
-        if(!dirElements.isEmpty()){
+        if (!dirElements.isEmpty()) {
             dirElements.clear();
         }
         return directory;
     }
 
     /** Replaces two occurences of a substring in a string by a pair of strings if 
-      * that substring occurs twice in the string. This method is not greedy! You'll
-      * have to run it in a loop if you want to replace all occurences of the substring.
-      * This method provides special treatment for headlines.
-      * @param input the string that something is to be replaced in
-      * @param pat substring to be replaced
-      * @param repl1 string substring gets replaced by on uneven occurences
-      * @param repl2 string substring gets replaced by on even occurences
-      */
-      //[MN]
-    private String pairReplace(String input, final String pat, final String repl1, final String repl2){
+     * that substring occurs twice in the string. This method is not greedy! You'll
+     * have to run it in a loop if you want to replace all occurences of the substring.
+     * This method provides special treatment for headlines.
+     * @param input the string that something is to be replaced in
+     * @param pat substring to be replaced
+     * @param repl1 string substring gets replaced by on uneven occurences
+     * @param repl2 string substring gets replaced by on even occurences
+     */
+    //[MN]
+    private String pairReplace(String input, final String pat, final String repl1, final String repl2) {
         String direlem = "";    //string to keep headlines until they get added to List dirElements
         int p0 = 0;
         int p1 = 0;
         final int l = pat.length();
         //replace pattern if a pair of the pattern can be found in the line
-        if( ((p0 = input.indexOf(pat)) >= 0) && ((p1 = input.indexOf(pat, p0 + l)) >= 0) ) {
+        if (((p0 = input.indexOf(pat)) >= 0) && ((p1 = input.indexOf(pat, p0 + l)) >= 0)) {
             //extra treatment for headlines
-            if((pat.equals("===="))||(pat.equals("==="))||(pat.equals("=="))){
+            if ((pat.equals("====")) || (pat.equals("===")) || (pat.equals("=="))) {
                 //add anchor and create headline
                 direlem = input.substring(p0 + l, p1);
                 //counting double headlines
                 int doubles = 0;
-                for(int i=0;i<dirElements.size();i++){
-                	if (dirElements.get(i) == null) continue;
-                    if(dirElements.size() > i && dirElements.get(i).substring(1).equals(direlem)){
+                for (int i = 0; i < dirElements.size(); i++) {
+                    if (dirElements.get(i) == null) {
+                        continue;
+                    }
+                    if (dirElements.size() > i && dirElements.get(i).substring(1).equals(direlem)) {
                         doubles++;
                     }
                 }
-                String anchor = direlem.replaceAll(" ","_").replaceAll("[^a-zA-Z0-9_]",""); //replace blanks with underscores and delete everything thats not a regular character, a number or _
+                String anchor = direlem.replaceAll(" ", "_").replaceAll("[^a-zA-Z0-9_]", ""); //replace blanks with underscores and delete everything thats not a regular character, a number or _
                 //if there are doubles, add underscore and number of doubles plus one
-                if(doubles>0){
-                    anchor = anchor + "_" + (doubles+1);
+                if (doubles > 0) {
+                    anchor = anchor + "_" + (doubles + 1);
                 }
-                input = input.substring(0, p0) + "<a name=\""+anchor+"\"></a>" + repl1 +
-                direlem + repl2 + input.substring(p1 + l);
+                input = input.substring(0, p0) + "<a name=\"" + anchor + "\"></a>" + repl1 +
+                        direlem + repl2 + input.substring(p1 + l);
                 //add headlines to list of headlines (so TOC can be created)
-                if(pat.equals("===="))     dirElements.add("3"+direlem);
-                else if(pat.equals("===")) dirElements.add("2"+direlem);
-                else if(pat.equals("=="))  dirElements.add("1"+direlem);
-            }
-            else{
-                input = input.substring(0, p0) +  repl1 +
-                (/*direlem =*/ input.substring(p0 + l, p1)) + repl2 +
-                input.substring(p1 + l);
+                if (pat.equals("====")) {
+                    dirElements.add("3" + direlem);
+                } else if (pat.equals("===")) {
+                    dirElements.add("2" + direlem);
+                } else if (pat.equals("==")) {
+                    dirElements.add("1" + direlem);
+                }
+            } else {
+                input = input.substring(0, p0) + repl1 +
+                        (/*direlem =*/input.substring(p0 + l, p1)) + repl2 +
+                        input.substring(p1 + l);
             }
         }
         //recursion if a pair of the pattern can still be found in the line
-        if( ((p0 = input.indexOf(pat)) >= 0) && (input.indexOf(pat,p0 + l) >= 0) ){
+        if (((p0 = input.indexOf(pat)) >= 0) && (input.indexOf(pat, p0 + l) >= 0)) {
             input = pairReplace(input, pat, repl1, repl2);
         }
         return input;
     }
 
     /** Replaces wiki tags with HTML tags.
-      * @param result a line of text
-      * @param switchboard
-      * @return the line of text with HTML tags instead of wiki tags
-      */
+     * @param result a line of text
+     * @param switchboard
+     * @return the line of text with HTML tags instead of wiki tags
+     */
     public String transformLine(String result) {
         //If HTML has not bee replaced yet (can happen if method gets called in recursion), replace now!
-        if (!replacedHTML || preformattedSpan){
+        if (!replacedHTML || preformattedSpan) {
             result = htmlFilterCharacterCoding.unicode2html(result, true);
             replacedHTML = true;
         }
 
         //check if line contains preformatted symbols or if we are in a preformatted sequence already.
-        if ((result.indexOf("&lt;pre&gt;")>=0)||(result.indexOf("&lt;/pre&gt;")>=0)||(preformattedSpan)){
+        if ((result.indexOf("&lt;pre&gt;") >= 0) || (result.indexOf("&lt;/pre&gt;") >= 0) || (preformattedSpan)) {
             result = preformattedTag(result);
         } else {
 
@@ -693,14 +692,18 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
             result = processTable(result);
 
             // format lines
-            if (result.startsWith(" ")) result = "<tt>" + result.substring(1) + "</tt>";
-            if (result.startsWith("----")) result = "<hr />";
+            if (result.startsWith(" ")) {
+                result = "<tt>" + result.substring(1) + "</tt>";
+            }
+            if (result.startsWith("----")) {
+                result = "<hr />";
+            }
 
             // citings contributed by [MN]
-            if(result.startsWith(":")){
+            if (result.startsWith(":")) {
                 String head = "";
                 String tail = "";
-                while(result.startsWith(":")){
+                while (result.startsWith(":")) {
                     head = head + "<blockquote>";
                     tail = tail + "</blockquote>";
                     result = result.substring(1);
@@ -710,13 +713,13 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
             // end contrib [MN]	
 
             // format headers
-            result = pairReplace(result,"====","<h4>","</h4>");
-            result = pairReplace(result,"===","<h3>","</h3>");
-            result = pairReplace(result,"==","<h2>","</h2>");
+            result = pairReplace(result, "====", "<h4>", "</h4>");
+            result = pairReplace(result, "===", "<h3>", "</h3>");
+            result = pairReplace(result, "==", "<h2>", "</h2>");
 
-            result = pairReplace(result,"'''''","<b><i>","</i></b>");
-            result = pairReplace(result,"'''","<b>","</b>");
-            result = pairReplace(result,"''","<i>","</i>");
+            result = pairReplace(result, "'''''", "<b><i>", "</i></b>");
+            result = pairReplace(result, "'''", "<b>", "</b>");
+            result = pairReplace(result, "''", "<i>", "</i>");
 
             result = unorderedList(result);
             result = orderedList(result);
@@ -726,8 +729,12 @@ public class wikiCode extends abstractWikiParser implements wikiParser {
 
         }
 
-        if (!preformatted) replacedHTML = false;
-        if ((result.endsWith("</li>"))||(defList)||(escape)||(preformatted)||(table)||(cellprocessing)) return result;
+        if (!preformatted) {
+            replacedHTML = false;
+        }
+        if ((result.endsWith("</li>")) || (defList) || (escape) || (preformatted) || (table) || (cellprocessing)) {
+            return result;
+        }
         return result + "<br />";
     }
 }