diff --git a/src/main/java/org/umlgraph/doclet/ClassGraph.java b/src/main/java/org/umlgraph/doclet/ClassGraph.java
index 0157d53..249a923 100644
--- a/src/main/java/org/umlgraph/doclet/ClassGraph.java
+++ b/src/main/java/org/umlgraph/doclet/ClassGraph.java
@@ -82,7 +82,7 @@ class ClassGraph {
 
     protected Map<String, ClassInfo> classnames = new HashMap<String, ClassInfo>();
     protected Set<String> rootClasses;
-	protected Map<String, ClassDoc> rootClassdocs = new HashMap<String, ClassDoc>();
+    protected Map<String, ClassDoc> rootClassdocs = new HashMap<String, ClassDoc>();
     protected OptionProvider optionProvider;
     protected PrintWriter w;
     protected ClassDoc collectionClassDoc;
@@ -673,7 +673,8 @@ class ClassGraph {
 	}
     }
 
-    /** Returns an array representing the imported classes of c.
+    /**
+     * Returns an array representing the imported classes of c.
      * Disables the deprecation warning, which is output, because the
      * imported classed are an implementation detail.
      */
@@ -848,8 +849,10 @@ class ClassGraph {
 		.append(".html").toString();
     }
 
-    /** Dot prologue 
-     * @throws IOException */
+    /**
+     * Dot prologue 
+     * @throws IOException
+     */
     public void prologue() throws IOException {
 	Options opt = optionProvider.getGlobalOptions();
 	OutputStream os;
diff --git a/src/main/java/org/umlgraph/doclet/ClassInfo.java b/src/main/java/org/umlgraph/doclet/ClassInfo.java
index f498210..34480c5 100644
--- a/src/main/java/org/umlgraph/doclet/ClassInfo.java
+++ b/src/main/java/org/umlgraph/doclet/ClassInfo.java
@@ -66,7 +66,5 @@ class ClassInfo {
     public static void reset() {
 	classNumber = 0;
     }
-
-    
 }
 
diff --git a/src/main/java/org/umlgraph/doclet/ContextMatcher.java b/src/main/java/org/umlgraph/doclet/ContextMatcher.java
index cc59d00..cfa4ed3 100644
--- a/src/main/java/org/umlgraph/doclet/ContextMatcher.java
+++ b/src/main/java/org/umlgraph/doclet/ContextMatcher.java
@@ -192,5 +192,4 @@ public class ContextMatcher implements ClassMatcher {
 	}
 
     }
-
 }
diff --git a/src/main/java/org/umlgraph/doclet/ContextView.java b/src/main/java/org/umlgraph/doclet/ContextView.java
index 040725e..9adb5fc 100755
--- a/src/main/java/org/umlgraph/doclet/ContextView.java
+++ b/src/main/java/org/umlgraph/doclet/ContextView.java
@@ -116,5 +116,4 @@ public class ContextView implements OptionProvider {
 	if (!(matcher.matches(className) || opt.matchesIncludeExpression(className)))
 	    opt.setOption(HIDE_OPTIONS);
     }
-
 }
diff --git a/src/main/java/org/umlgraph/doclet/InterfaceMatcher.java b/src/main/java/org/umlgraph/doclet/InterfaceMatcher.java
index 6c63b98..2f87370 100644
--- a/src/main/java/org/umlgraph/doclet/InterfaceMatcher.java
+++ b/src/main/java/org/umlgraph/doclet/InterfaceMatcher.java
@@ -38,5 +38,4 @@ public class InterfaceMatcher implements ClassMatcher {
 	ClassDoc cd = root.classNamed(name);
 	return cd == null ? false : matches(cd);
     }
-
 }
diff --git a/src/main/java/org/umlgraph/doclet/Options.java b/src/main/java/org/umlgraph/doclet/Options.java
index 90b7542..836432e 100644
--- a/src/main/java/org/umlgraph/doclet/Options.java
+++ b/src/main/java/org/umlgraph/doclet/Options.java
@@ -130,7 +130,7 @@ public class Options implements Cloneable, OptionProvider {
     }
 
     @Override
-	public Object clone() {
+    public Object clone() {
 	Options clone = null;
 	try {
 	     clone = (Options) super.clone();
@@ -680,5 +680,4 @@ public class Options implements Cloneable, OptionProvider {
 	}
 	return sb.toString();
     }
-
 }
diff --git a/src/main/java/org/umlgraph/doclet/PackageMatcher.java b/src/main/java/org/umlgraph/doclet/PackageMatcher.java
index aae6e3e..be1183f 100644
--- a/src/main/java/org/umlgraph/doclet/PackageMatcher.java
+++ b/src/main/java/org/umlgraph/doclet/PackageMatcher.java
@@ -20,5 +20,4 @@ public class PackageMatcher implements ClassMatcher {
 		return true;
 	return false;
     }
-
 }
diff --git a/src/main/java/org/umlgraph/doclet/PackageView.java b/src/main/java/org/umlgraph/doclet/PackageView.java
index c66bf6d..1547ebb 100755
--- a/src/main/java/org/umlgraph/doclet/PackageView.java
+++ b/src/main/java/org/umlgraph/doclet/PackageView.java
@@ -77,5 +77,4 @@ public class PackageView implements OptionProvider {
 	if (!included || this.opt.matchesHideExpression(className))
 	    opt.setOption(HIDE);
     }
-
 }
diff --git a/src/main/java/org/umlgraph/doclet/PatternMatcher.java b/src/main/java/org/umlgraph/doclet/PatternMatcher.java
index 78a9135..59c2d47 100644
--- a/src/main/java/org/umlgraph/doclet/PatternMatcher.java
+++ b/src/main/java/org/umlgraph/doclet/PatternMatcher.java
@@ -14,6 +14,7 @@
  *
  *
  */
+
 package org.umlgraph.doclet;
 
 import java.util.regex.Pattern;
@@ -39,5 +40,4 @@ public class PatternMatcher implements ClassMatcher {
     public boolean matches(String name) {
 	return pattern.matcher(name).matches();
     }
-
 }
diff --git a/src/main/java/org/umlgraph/doclet/RelationDirection.java b/src/main/java/org/umlgraph/doclet/RelationDirection.java
index 4d3595c..39dab31 100644
--- a/src/main/java/org/umlgraph/doclet/RelationDirection.java
+++ b/src/main/java/org/umlgraph/doclet/RelationDirection.java
@@ -36,5 +36,4 @@ public enum RelationDirection {
     public RelationDirection inverse() {
 	return this == IN ? OUT : this == OUT ? IN : this;
     }
-
-};
+}
diff --git a/src/main/java/org/umlgraph/doclet/RelationPattern.java b/src/main/java/org/umlgraph/doclet/RelationPattern.java
index 4fa994e..0de0490 100644
--- a/src/main/java/org/umlgraph/doclet/RelationPattern.java
+++ b/src/main/java/org/umlgraph/doclet/RelationPattern.java
@@ -46,5 +46,4 @@ public class RelationPattern {
 	}
 	return false;
     }
-
 }
diff --git a/src/main/java/org/umlgraph/doclet/SubclassMatcher.java b/src/main/java/org/umlgraph/doclet/SubclassMatcher.java
index 999b823..c96a500 100644
--- a/src/main/java/org/umlgraph/doclet/SubclassMatcher.java
+++ b/src/main/java/org/umlgraph/doclet/SubclassMatcher.java
@@ -32,5 +32,4 @@ public class SubclassMatcher implements ClassMatcher {
 	ClassDoc cd = root.classNamed(name);
 	return cd == null ? false : matches(cd);
     }
-
 }
diff --git a/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java
index dca406f..46d0d22 100644
--- a/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java
+++ b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java
@@ -138,12 +138,12 @@ public class UmlGraphDoc {
       dotExecutable = "dot";
     }
 	File dotFile = new File(outputFolder, packageName.replace(".", "/") + "/" + name + ".dot");
-  File svgFile = new File(outputFolder, packageName.replace(".", "/") + "/" + name + ".svg");
+	File svgFile = new File(outputFolder, packageName.replace(".", "/") + "/" + name + ".svg");
 
 	try {
 	    Process p = Runtime.getRuntime().exec(new String [] {
 		dotExecutable,
-    "-Tsvg",
+		"-Tsvg",
 		"-o",
 		svgFile.getAbsolutePath(),
 		dotFile.getAbsolutePath()
diff --git a/src/main/java/org/umlgraph/doclet/View.java b/src/main/java/org/umlgraph/doclet/View.java
index 8659a1c..da087cc 100644
--- a/src/main/java/org/umlgraph/doclet/View.java
+++ b/src/main/java/org/umlgraph/doclet/View.java
@@ -14,6 +14,7 @@
  *
  *
  */
+
 package org.umlgraph.doclet;
 
 import java.util.ArrayList;
@@ -169,5 +170,4 @@ public class View implements OptionProvider {
     public String getDisplayName() {
 	return "view " + viewDoc.name();
     }
-
 }
diff --git a/src/main/java/org/umlgraph/doclet/Visibility.java b/src/main/java/org/umlgraph/doclet/Visibility.java
index 408a551..87c4134 100644
--- a/src/main/java/org/umlgraph/doclet/Visibility.java
+++ b/src/main/java/org/umlgraph/doclet/Visibility.java
@@ -16,6 +16,7 @@
  *
  *
  */
+
 package org.umlgraph.doclet;
 
 import com.sun.javadoc.ProgramElementDoc;
diff --git a/src/test/java/org/umlgraph/test/BasicTest.java b/src/test/java/org/umlgraph/test/BasicTest.java
index 5eef6e3..b989a6d 100644
--- a/src/test/java/org/umlgraph/test/BasicTest.java
+++ b/src/test/java/org/umlgraph/test/BasicTest.java
@@ -145,5 +145,4 @@ public class BasicTest {
 	    differences.add(dotFile.getName() + " is different from the reference");
 	}
     }
-
 }
diff --git a/src/test/java/org/umlgraph/test/DotDiff.java b/src/test/java/org/umlgraph/test/DotDiff.java
index 266981a..420c32a 100644
--- a/src/test/java/org/umlgraph/test/DotDiff.java
+++ b/src/test/java/org/umlgraph/test/DotDiff.java
@@ -304,5 +304,4 @@ public class DotDiff {
             return "Arc: " + from.label + " -> " + to.label + "; " + line;
         }
     }
-
 }
diff --git a/src/test/java/org/umlgraph/test/RunDoc.java b/src/test/java/org/umlgraph/test/RunDoc.java
index 3a7f525..6261d9c 100644
--- a/src/test/java/org/umlgraph/test/RunDoc.java
+++ b/src/test/java/org/umlgraph/test/RunDoc.java
@@ -43,5 +43,4 @@ public class RunDoc {
 	com.sun.tools.javadoc.Main.execute("UMLGraph test", pw, pw, pw,
 		"org.umlgraph.doclet.UmlGraphDoc", options);
     }
-
 }
diff --git a/src/test/java/org/umlgraph/test/RunOne.java b/src/test/java/org/umlgraph/test/RunOne.java
index e2f7b8c..0fb55da 100644
--- a/src/test/java/org/umlgraph/test/RunOne.java
+++ b/src/test/java/org/umlgraph/test/RunOne.java
@@ -55,6 +55,4 @@ public class RunOne {
     private static void runDoclet(String[] options) {
 	com.sun.tools.javadoc.Main.execute("UMLGraph test", pw, pw, pw, "org.umlgraph.doclet.UmlGraph", options);
     }
-
-    
 }
diff --git a/src/test/java/org/umlgraph/test/SimpleFileFilter.java b/src/test/java/org/umlgraph/test/SimpleFileFilter.java
index 9c3b123..c45db53 100644
--- a/src/test/java/org/umlgraph/test/SimpleFileFilter.java
+++ b/src/test/java/org/umlgraph/test/SimpleFileFilter.java
@@ -16,6 +16,7 @@
  *
  *
  */
+
 package org.umlgraph.test;
 
 import java.io.File;
@@ -31,4 +32,4 @@ class SimpleFileFilter implements FilenameFilter {
     public boolean accept(File dir, String name) {
         return name.endsWith(extension);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/umlgraph/test/TestUtils.java b/src/test/java/org/umlgraph/test/TestUtils.java
index 3259d91..b59ce72 100644
--- a/src/test/java/org/umlgraph/test/TestUtils.java
+++ b/src/test/java/org/umlgraph/test/TestUtils.java
@@ -34,10 +34,10 @@ import java.util.List;
 public class TestUtils {
 
     /**
-         * Simple text file diffing: will tell you if two text files are line by
-         * line equals, and will stop at the first difference found.
-         * @throws IOException
-         */
+    * Simple text file diffing: will tell you if two text files are line by
+    * line equals, and will stop at the first difference found.
+    * @throws IOException
+    */
     public static boolean textFilesEquals(PrintWriter pw, File refTextFile, File outTextFile)
 	    throws IOException {
 	BufferedReader refReader = null, outReader = null;
@@ -123,8 +123,8 @@ public class TestUtils {
     }
 
     /**
-         * Deletes the content of the folder, eventually in a recursive way
-         */
+    * Deletes the content of the folder, eventually in a recursive way
+    */
     public static void cleanFolder(File folder, boolean recurse) {
 	for (File f : folder.listFiles()) {
 	    if (f.isDirectory()) {
@@ -138,7 +138,5 @@ public class TestUtils {
 	    }
 
 	}
-
     }
-
 }
diff --git a/src/test/java/org/umlgraph/test/UmlDocTest.java b/src/test/java/org/umlgraph/test/UmlDocTest.java
index 971224b..ac6ab12 100644
--- a/src/test/java/org/umlgraph/test/UmlDocTest.java
+++ b/src/test/java/org/umlgraph/test/UmlDocTest.java
@@ -16,6 +16,7 @@
  *
  *
  */
+
 package org.umlgraph.test;
 
 import java.io.File;
@@ -78,14 +79,14 @@ public class UmlDocTest {
     }
 
     /**
-         * Ensures that reference and output have the same contents in terms of:
-         * <ul>
-         * <li> html files </li>
-         * <li> dot files </li>
-         * <li> folders </li>
-         * </ul>
-         * @throws IOException
-         */
+    * Ensures that reference and output have the same contents in terms of:
+    * <ul>
+    * <li> html files </li>
+    * <li> dot files </li>
+    * <li> folders </li>
+    * </ul>
+    * @throws IOException
+    */
     private static void compareDocletOutputs(List<String> differences, File refFolder,
 	    File outFolder) throws IOException {
 	if (!refFolder.exists() || !refFolder.isDirectory())
@@ -139,9 +140,9 @@ public class UmlDocTest {
     }
 
     /**
-         * Runs the UmlGraphDoc doclet
-         * @param options
-         */
+    * Runs the UmlGraphDoc doclet
+    * @param options
+    */
     private static void runDoclet(String[] options) {
 	pw.print("Run javadoc -doclet " + doclet);
 	for (String o : options)
@@ -150,5 +151,4 @@ public class UmlDocTest {
 	com.sun.tools.javadoc.Main.execute("UMLDoc test", pw, pw, pw,
 		doclet, options);
     }
-
 }