Index: Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendTreeView.cs
===================================================================
diff -u -ra6cb591651331c7e1a881bea6c41d77553821ab8 -re4f84ca3793e7f556bca95eaeb294d22b13cdf51
--- Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendTreeView.cs	(.../LegendTreeView.cs)	(revision a6cb591651331c7e1a881bea6c41d77553821ab8)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendTreeView.cs	(.../LegendTreeView.cs)	(revision e4f84ca3793e7f556bca95eaeb294d22b13cdf51)
@@ -1,7 +1,6 @@
-using Core.Common.Base;
+using Core.Common.Controls.TreeView;
 using Core.Components.Charting.Data;
 using Core.Components.OxyPlot.Forms;
-using TreeView = Core.Common.Controls.TreeView.TreeView;
 
 namespace Core.Plugins.OxyPlot.Legend
 {
@@ -28,12 +27,12 @@
         {
             get
             {
-                return (ChartData)Data;
+                return (ChartData) Data;
             }
             set
             {
                 Data = value;
-                
+
                 if (value == null)
                 {
                     Nodes.Clear();
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.cs
===================================================================
diff -u -rfc0a61c81da4dcf9f436c8b8bd9c51c6b4d65ef8 -re4f84ca3793e7f556bca95eaeb294d22b13cdf51
--- Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.cs	(.../LegendView.cs)	(revision fc0a61c81da4dcf9f436c8b8bd9c51c6b4d65ef8)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.cs	(.../LegendView.cs)	(revision e4f84ca3793e7f556bca95eaeb294d22b13cdf51)
@@ -28,7 +28,7 @@
             }
             set
             {
-                UpdateTree((ChartData)value);
+                UpdateTree((ChartData) value);
             }
         }
 
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LegendTreeViewTest.cs
===================================================================
diff -u -ra6cb591651331c7e1a881bea6c41d77553821ab8 -re4f84ca3793e7f556bca95eaeb294d22b13cdf51
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LegendTreeViewTest.cs	(.../LegendTreeViewTest.cs)	(revision a6cb591651331c7e1a881bea6c41d77553821ab8)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LegendTreeViewTest.cs	(.../LegendTreeViewTest.cs)	(revision e4f84ca3793e7f556bca95eaeb294d22b13cdf51)
@@ -49,10 +49,10 @@
             CollectionAssert.IsEmpty(lineObservers);
         }
 
-        class TestChartData : ChartDataCollection
+        private class TestChartData : ChartDataCollection
         {
-            public static PointData Point = new PointData(Enumerable.Empty<Tuple<double, double>>());
-            public static LineData Line = new LineData(Enumerable.Empty<Tuple<double, double>>());
+            public static readonly PointData Point = new PointData(Enumerable.Empty<Tuple<double, double>>());
+            public static readonly LineData Line = new LineData(Enumerable.Empty<Tuple<double, double>>());
 
             public TestChartData() : base(new List<ChartData>
             {