diff --git a/src/main/java/com/xeiam/xchart/AxisTick.java b/src/main/java/com/xeiam/xchart/AxisTick.java
index 05cafb641cf067069d59416997fa40ddecb2dfe5..caae910f317ea648bd9ed4c9d894f4e9a79f8457 100644
--- a/src/main/java/com/xeiam/xchart/AxisTick.java
+++ b/src/main/java/com/xeiam/xchart/AxisTick.java
@@ -57,13 +57,12 @@ public class AxisTick implements IChartPart, IHideable {
   private int workingSpace;
 
   /** the normal format for tick labels */
-  private Format normalFormat = new DecimalFormat("#.###########");
+  private Format normalFormat;
 
   /** the scientific format for tick labels */
-  private Format scientificFormat = new DecimalFormat("0.###E0");
+  private Format scientificFormat;
 
-  // private SimpleDateFormat simpleDateformat = new SimpleDateFormat("dd.MM.yyyy");
-  private SimpleDateFormat simpleDateformat = new SimpleDateFormat("MM-dd");
+  private SimpleDateFormat simpleDateformat;
 
   /** the bounds */
   private Rectangle bounds;
@@ -72,9 +71,8 @@ public class AxisTick implements IChartPart, IHideable {
   protected boolean isVisible = true; // default to true
 
   /**
-   * Constructor.
+   * Constructor
    * 
-   * @param chart the chart
    * @param axis the axis
    */
   protected AxisTick(Axis axis) {
@@ -83,6 +81,10 @@ public class AxisTick implements IChartPart, IHideable {
     axisTickLabels = new AxisTickLabels(this);
     axisTickMarks = new AxisTickMarks(this);
 
+    normalFormat = new DecimalFormat("#.###########");
+    scientificFormat = new DecimalFormat("0.###E0");
+    simpleDateformat = new SimpleDateFormat("MM-dd");
+
   }
 
   @Override
diff --git a/src/main/java/com/xeiam/xchart/AxisTickLabels.java b/src/main/java/com/xeiam/xchart/AxisTickLabels.java
index b223bf8b6c7716ea8cd955afafc170b2a0ee724b..2b8dbc2ac0f75c8e51d80cdf68def31519ed3fda 100644
--- a/src/main/java/com/xeiam/xchart/AxisTickLabels.java
+++ b/src/main/java/com/xeiam/xchart/AxisTickLabels.java
@@ -40,7 +40,7 @@ public class AxisTickLabels implements IChartPart {
   /**
    * Constructor
    * 
-   * @param axis the axis
+   * @param axisTick
    */
   protected AxisTickLabels(AxisTick axisTick) {
 
diff --git a/src/main/java/com/xeiam/xchart/AxisTickMarks.java b/src/main/java/com/xeiam/xchart/AxisTickMarks.java
index 9081bad4d683e057cc86357b695289c18e0e8606..5f0262210390ee8c0c584e29d545c6a45fc2a04b 100644
--- a/src/main/java/com/xeiam/xchart/AxisTickMarks.java
+++ b/src/main/java/com/xeiam/xchart/AxisTickMarks.java
@@ -42,7 +42,6 @@ public class AxisTickMarks implements IChartPart {
   /**
    * Constructor
    * 
-   * @param axis
    * @param axisTick
    */
   protected AxisTickMarks(AxisTick axisTick) {
diff --git a/src/main/java/com/xeiam/xchart/Chart.java b/src/main/java/com/xeiam/xchart/Chart.java
index 5242a307c39988c0f1b84157497e4abfd5779b30..40be0131250150baed75eae868304287058352c8 100644
--- a/src/main/java/com/xeiam/xchart/Chart.java
+++ b/src/main/java/com/xeiam/xchart/Chart.java
@@ -49,8 +49,8 @@ public class Chart {
   /**
    * Constructor
    * 
-   * @param pWidth
-   * @param pHeight
+   * @param width
+   * @param height
    */
   public Chart(int width, int height) {
 
diff --git a/src/main/java/com/xeiam/xchart/ChartLegend.java b/src/main/java/com/xeiam/xchart/ChartLegend.java
index 64a42cc719df7874c1105361edf63defcf3139dc..54ae22d666a0c0002b8b727fbf316f4a81794a2d 100644
--- a/src/main/java/com/xeiam/xchart/ChartLegend.java
+++ b/src/main/java/com/xeiam/xchart/ChartLegend.java
@@ -51,6 +51,8 @@ public class ChartLegend implements IHideable {
 
   /**
    * Constructor
+   * 
+   * @param chart
    */
   public ChartLegend(Chart chart) {
 
diff --git a/src/main/java/com/xeiam/xchart/ChartTitle.java b/src/main/java/com/xeiam/xchart/ChartTitle.java
index 478251acf931ccfd34f3474d085cb440a0870cc3..d85fb687136e5e547d9e094570148d52d00b4fba 100644
--- a/src/main/java/com/xeiam/xchart/ChartTitle.java
+++ b/src/main/java/com/xeiam/xchart/ChartTitle.java
@@ -45,6 +45,8 @@ public class ChartTitle implements IHideable {
 
   /**
    * Constructor
+   * 
+   * @param chart
    */
   public ChartTitle(Chart chart) {
 
diff --git a/src/main/java/com/xeiam/xchart/PlotSurface.java b/src/main/java/com/xeiam/xchart/PlotSurface.java
index e3dec555d8606ea04253e118498f1a5028d680f3..ab6a53d03178db19a23fb1061e330fb1659aef75 100644
--- a/src/main/java/com/xeiam/xchart/PlotSurface.java
+++ b/src/main/java/com/xeiam/xchart/PlotSurface.java
@@ -47,7 +47,6 @@ public class PlotSurface implements IChartPart, IHideable {
   /**
    * Constructor
    * 
-   * @param chart
    * @param plot
    */
   protected PlotSurface(Plot plot) {
diff --git a/src/main/java/com/xeiam/xchart/SwingWrapper.java b/src/main/java/com/xeiam/xchart/SwingWrapper.java
index f2d6a3831775a5c1087d41cfc9237fbf0eba8790..4e109e04edfbc20abf4758b146e8efa650ae8c8d 100644
--- a/src/main/java/com/xeiam/xchart/SwingWrapper.java
+++ b/src/main/java/com/xeiam/xchart/SwingWrapper.java
@@ -22,7 +22,6 @@ import java.util.List;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 
-
 /**
  * @author timmolter
  */
@@ -43,11 +42,9 @@ public class SwingWrapper {
   }
 
   /**
-   * Constructor - The number of rows and columns will be calculated automatically
+   * Constructor - The number of rows and columns will be calculated automatically Constructor
    * 
    * @param charts
-   * @param numRows
-   * @param numColumns
    */
   public SwingWrapper(List<Chart> charts) {
 
diff --git a/src/main/java/com/xeiam/xchart/series/SeriesMarker.java b/src/main/java/com/xeiam/xchart/series/SeriesMarker.java
index 8e9f99ff006275e3087038bd9fb2d14eaff2b383..0cd713007bc403a6534d8e408572001fdfb2f374 100644
--- a/src/main/java/com/xeiam/xchart/series/SeriesMarker.java
+++ b/src/main/java/com/xeiam/xchart/series/SeriesMarker.java
@@ -26,7 +26,6 @@ import com.xeiam.xchart.series.markers.Square;
 import com.xeiam.xchart.series.markers.TriangleDown;
 import com.xeiam.xchart.series.markers.TriangleUp;
 
-
 /**
  * @author timmolter
  */