diff --git a/src/main/java/org/jpeek/App.java b/src/main/java/org/jpeek/App.java
index 61d35b6d..0ff891b2 100644
--- a/src/main/java/org/jpeek/App.java
+++ b/src/main/java/org/jpeek/App.java
@@ -119,7 +119,7 @@ public App(final Path source, final Path target,
 
      * @throws IOException If fails
      *  Analyze method is too big. We need to extract report building from
-     *  here and use a map instead of if statements se we can make
+     *  here and use a map instead of if statements so we can make
      *  easier to add and remove metrics from execution.
      */
     @SuppressWarnings({
@@ -300,7 +300,7 @@ private boolean copyXsl(final String name) throws IOException {
     }
 
     /**
-     * Copy XSL.
+     * Copy XSD.
 
      * @param name The name of resource
      * @return TRUE if copied
diff --git a/src/main/java/org/jpeek/Metrics.java b/src/main/java/org/jpeek/Metrics.java
index b8d8ba5e..3377eb08 100644
--- a/src/main/java/org/jpeek/Metrics.java
+++ b/src/main/java/org/jpeek/Metrics.java
@@ -7,7 +7,7 @@
 /**
  * Metrics
 
- * <p>Enumeration representing various metrics along with their configuration.
+ * <p>Enumeration representing various metrics along with their configuration.</p>
  */
 public enum Metrics {
 
@@ -34,7 +34,7 @@ public enum Metrics {
     LCOM5(true, 0.5d, -0.1d),
 
     /**
-     * Lack of Cohesion in Methods 4  metric. Measuring Coupling and Cohesion In
+     * Lack of Cohesion in Methods 4 metric. Measuring Coupling and Cohesion In
      * Object-Oriented Systems
      */
     LCOM4(true, 0.5d, -0.1d),
@@ -60,7 +60,7 @@ public enum Metrics {
     /**
      * A Sensitive Metric of Class Cohesion metric.
      * [A] new metric [...] yielding meaningful values [...] more sensitive than those previously
-     * reported,
+     * reported
      */
     SCOM(true, null, null),
 
diff --git a/src/main/java/org/jpeek/ReportData.java b/src/main/java/org/jpeek/ReportData.java
index 936e2c1d..cd798fd8 100644
--- a/src/main/java/org/jpeek/ReportData.java
+++ b/src/main/java/org/jpeek/ReportData.java
@@ -28,17 +28,17 @@ final class ReportData {
     /**
      * The metric.
      */
-    private final String metr;
+    private final String metric;
 
     /**
      * Mean.
      */
-    private final double man;
+    private final double mean;
 
     /**
      * Sigma.
      */
-    private final double sig;
+    private final double sigma;
 
     /**
      * XSL params.
@@ -76,10 +76,10 @@ final class ReportData {
      */
     ReportData(final String name, final Map<String, Object> args, final double mean,
         final double sigma) {
-        this.metr = name;
+        this.metric = name;
         this.args = new MapOf<String, Object>(new HashMap<>(args));
-        this.man = mean;
-        this.sig = sigma;
+        this.mean = mean;
+        this.sigma = sigma;
     }
 
     /**
@@ -87,7 +87,7 @@ final class ReportData {
      * @return The metric
      */
     public String metric() {
-        return this.metr;
+        return this.metric;
     }
 
     /**
@@ -95,7 +95,7 @@ public String metric() {
      * @return The mean
      */
     public double mean() {
-        return this.man;
+        return this.mean;
     }
 
     /**
@@ -103,7 +103,7 @@ public double mean() {
      * @return Sigma
      */
     public double sigma() {
-        return this.sig;
+        return this.sigma;
     }
 
     /**