diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartPainter.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartPainter.java
index 35968240a1f8316b22694b8a5b26c29e79b5a459..ccc1e09db98bca490120d4e092cdf6fb625c5174 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartPainter.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartPainter.java
@@ -54,7 +54,7 @@ public class ChartPainter {
 
     chartLegend = new Legend(this);
     axisPair = new AxisPair(this);
-    plot = new Plot(this, styleManager);
+    plot = new Plot(this);
     chartTitle = new ChartTitle(this);
   }
 
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java
index 8677fd0bbd907a3112900225eb44ef646026b7b7..59be2c9fa4880d91e08a2dda15d15250dd591f20 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java
@@ -18,7 +18,6 @@ package com.xeiam.xchart.internal.chartpart;
 import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
 
-import com.xeiam.xchart.StyleManager;
 import com.xeiam.xchart.StyleManager.ChartType;
 
 /**
@@ -36,18 +35,15 @@ public class Plot implements ChartPart {
 
   private PlotContent plotContent;
 
-  private StyleManager styleManager;
-
   /**
    * Constructor
    * 
    * @param chartPainter
    */
-  public Plot(ChartPainter chartPainter, StyleManager styleManager) {
+  public Plot(ChartPainter chartPainter) {
 
     this.chartPainter = chartPainter;
     this.plotSurface = new PlotSurface(this);
-    this.styleManager = styleManager;
 
   }
 
@@ -80,10 +76,10 @@ public class Plot implements ChartPart {
 
     plotSurface.paint(g);
     if (getChartPainter().getStyleManager().getChartType() == ChartType.Bar) {
-      this.plotContent = new PlotContentBarChart(this, styleManager);
+      this.plotContent = new PlotContentBarChart(this);
     }
     else {
-      this.plotContent = new PlotContentLineChart(this, styleManager);
+      this.plotContent = new PlotContentLineChart(this);
     }
     plotContent.paint(g);
 
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentBarChart.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentBarChart.java
index a9706c85d67ebb0a3dc8e8313fbcd361d073d2db..dd3ed68526ebf505b20e3f8062c012699abca317 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentBarChart.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentBarChart.java
@@ -32,24 +32,22 @@ import com.xeiam.xchart.internal.Utils;
  */
 public class PlotContentBarChart extends PlotContent {
 
-  private StyleManager styleManager;
-
   /**
    * Constructor
    * 
    * @param plot
    */
-  protected PlotContentBarChart(Plot plot, StyleManager styleManager) {
+  protected PlotContentBarChart(Plot plot) {
 
     super(plot);
-    this.styleManager = styleManager;
   }
 
   @Override
   public void paint(Graphics2D g) {
 
     Rectangle2D bounds = plot.getBounds();
-
+    StyleManager styleManager = plot.getChartPainter().getStyleManager();
+    
     // X-Axis
     int xTickSpace = (int)(styleManager.getAxisTickSpaceRatio() * bounds.getWidth());
     int xLeftMargin = Utils.getTickStartOffset((int) bounds.getWidth(), xTickSpace);
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentLineChart.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentLineChart.java
index 6f4bae54a6b54834405a58cf2a34867fd17573a0..9862a20c52b83cafac603fc98cb314fd71acac49 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentLineChart.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentLineChart.java
@@ -35,22 +35,21 @@ import com.xeiam.xchart.internal.chartpart.Axis.AxisType;
  */
 public class PlotContentLineChart extends PlotContent {
 
-  private StyleManager styleManager;
-
   /**
    * Constructor
    * 
    * @param plot
    */
-  protected PlotContentLineChart(Plot plot, StyleManager styleManager) {
+  protected PlotContentLineChart(Plot plot) {
+
     super(plot);
-    this.styleManager = styleManager;
   }
 
   @Override
   public void paint(Graphics2D g) {
 
     Rectangle2D bounds = plot.getBounds();
+    StyleManager styleManager = plot.getChartPainter().getStyleManager();
 
     // X-Axis
     int xTickSpace = (int)(styleManager.getAxisTickSpaceRatio() * bounds.getWidth());