diff --git a/src/test/java/com/xeiam/xchart/Example2.java b/src/test/java/com/xeiam/xchart/Example2.java
index 12051cf4b87570492f4c7bf70f3f44333821a833..85fd4eac2178978f96eedfd84374fd0b38261a3a 100644
--- a/src/test/java/com/xeiam/xchart/Example2.java
+++ b/src/test/java/com/xeiam/xchart/Example2.java
@@ -15,14 +15,12 @@
  */
 package com.xeiam.xchart;
 
-import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.series.Series;
 import com.xeiam.xchart.series.SeriesColor;
 import com.xeiam.xchart.series.SeriesLineStyle;
 import com.xeiam.xchart.series.SeriesMarker;
 import com.xeiam.xchart.swing.SwingWrapper;
 
-
 /**
  * Embed a Chart in a simple Swing application
  * 
@@ -57,8 +55,7 @@ public class Example2 {
     series1.setMarkerColor(SeriesColor.GREEN);
     series1.setMarker(SeriesMarker.SQUARE);
 
-    SwingWrapper swingHelper = new SwingWrapper(chart);
-    swingHelper.displayChart();
+    new SwingWrapper(chart).displayChart();
   }
 
 }
diff --git a/src/test/java/com/xeiam/xchart/Example3.java b/src/test/java/com/xeiam/xchart/Example3.java
index a8b398d82f836e7e6ab7eac12793951af7c3ff40..270e6a9aed5c88bffaecf861ccf53d8eb9699e2b 100644
--- a/src/test/java/com/xeiam/xchart/Example3.java
+++ b/src/test/java/com/xeiam/xchart/Example3.java
@@ -15,10 +15,8 @@
  */
 package com.xeiam.xchart;
 
-import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.swing.SwingWrapper;
 
-
 /**
  * Create multiple curves on one chart
  * 
@@ -52,8 +50,7 @@ public class Example3 {
 
     }
 
-    SwingWrapper swingHelper = new SwingWrapper(chart);
-    swingHelper.displayChart();
+    new SwingWrapper(chart).displayChart();
   }
 
 }
diff --git a/src/test/java/com/xeiam/xchart/Example4.java b/src/test/java/com/xeiam/xchart/Example4.java
index a1a9e180ad22a0d8b2172bb10220538168d92af0..b4b80b2d21ad2494a82648afe28fb3fd6ac41c2d 100644
--- a/src/test/java/com/xeiam/xchart/Example4.java
+++ b/src/test/java/com/xeiam/xchart/Example4.java
@@ -19,7 +19,6 @@ import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.QuickChart;
 import com.xeiam.xchart.swing.SwingWrapper;
 
-
 /**
  * Create a chart matrix
  * 
diff --git a/src/test/java/com/xeiam/xchart/Example5.java b/src/test/java/com/xeiam/xchart/Example5.java
index 1bb733cb2321ac7be10a7fbc05b52f037bc7a1a0..9bbe86c6029814d41ac934c6bf933d6066490537 100644
--- a/src/test/java/com/xeiam/xchart/Example5.java
+++ b/src/test/java/com/xeiam/xchart/Example5.java
@@ -15,10 +15,8 @@
  */
 package com.xeiam.xchart;
 
-import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.swing.SwingWrapper;
 
-
 /**
  * Plot vertical and horizontal lines
  * 
@@ -39,8 +37,7 @@ public class Example5 {
     chart.addSeries("vertical", new double[] { 1, 1 }, new double[] { -10, 10 });
     chart.addSeries("horizontal", new double[] { -10, 10 }, new double[] { 0, 0 });
 
-    SwingWrapper swingHelper = new SwingWrapper(chart);
-    swingHelper.displayChart();
+    new SwingWrapper(chart).displayChart();
   }
 
 }
diff --git a/src/test/java/com/xeiam/xchart/Example6.java b/src/test/java/com/xeiam/xchart/Example6.java
index a76ca9d1df4c059619eb894ee961ef962359c83f..b85fa53fb6d5b341c9cc8fd6268732e5d804b9b3 100644
--- a/src/test/java/com/xeiam/xchart/Example6.java
+++ b/src/test/java/com/xeiam/xchart/Example6.java
@@ -15,10 +15,8 @@
  */
 package com.xeiam.xchart;
 
-import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.swing.SwingWrapper;
 
-
 /**
  * Create chart with single point
  * 
@@ -38,8 +36,7 @@ public class Example6 {
 
     chart.addSeries("single point (1,1)", new double[] { 1 }, new double[] { 1 });
 
-    SwingWrapper swingHelper = new SwingWrapper(chart);
-    swingHelper.displayChart();
+    new SwingWrapper(chart).displayChart();
   }
 
 }
diff --git a/src/test/java/com/xeiam/xchart/Example7.java b/src/test/java/com/xeiam/xchart/Example7.java
index 368b31f9054bd07ed936d06edfa074869c55b30a..3eff91cba090e324d5010ffde3fc4842b119d3ab 100644
--- a/src/test/java/com/xeiam/xchart/Example7.java
+++ b/src/test/java/com/xeiam/xchart/Example7.java
@@ -15,10 +15,8 @@
  */
 package com.xeiam.xchart;
 
-import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.swing.SwingWrapper;
 
-
 /**
  * Create chart with NaN values
  * 
@@ -38,8 +36,7 @@ public class Example7 {
 
     chart.addSeries("NaN Value at (2,2)", null, new double[] { 0, 1, Double.NaN, 3, 4 });
 
-    SwingWrapper swingHelper = new SwingWrapper(chart);
-    swingHelper.displayChart();
+    new SwingWrapper(chart).displayChart();
   }
 
 }