diff --git a/Cairo/Perspex.Cairo/Media/FormattedTextImpl.cs b/Cairo/Perspex.Cairo/Media/FormattedTextImpl.cs
index 0b8d42b567..e77617f098 100644
--- a/Cairo/Perspex.Cairo/Media/FormattedTextImpl.cs
+++ b/Cairo/Perspex.Cairo/Media/FormattedTextImpl.cs
@@ -1,5 +1,5 @@
 // -----------------------------------------------------------------------
-// <copyright file="TextService.cs" company="Steven Kirk">
+// <copyright file="FormattedTextImpl.cs" company="Steven Kirk">
 // Copyright 2014 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
diff --git a/Perspex.Input/KeyboardNavigation.cs b/Perspex.Input/KeyboardNavigation.cs
index e9f43fd8ec..fcf5ff9826 100644
--- a/Perspex.Input/KeyboardNavigation.cs
+++ b/Perspex.Input/KeyboardNavigation.cs
@@ -1,5 +1,5 @@
 // -----------------------------------------------------------------------
-// <copyright file="FocusNavigationDirection.cs" company="Steven Kirk">
+// <copyright file="KeyboardNavigation.cs" company="Steven Kirk">
 // Copyright 2014 MIT Licence. See licence.md for more information.
 // </copyright>
 // -----------------------------------------------------------------------
diff --git a/Perspex.Interactivity/EventSubscription.cs b/Perspex.Interactivity/EventSubscription.cs
index 8cb0a61280..ca761e5831 100644
--- a/Perspex.Interactivity/EventSubscription.cs
+++ b/Perspex.Interactivity/EventSubscription.cs
@@ -1,11 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+// -----------------------------------------------------------------------
+// <copyright file="EventSubscription.cs" company="Steven Kirk">
+// Copyright 2014 MIT Licence. See licence.md for more information.
+// </copyright>
+// -----------------------------------------------------------------------
 
 namespace Perspex.Interactivity
 {
+    using System;
+
     internal class EventSubscription
     {
         public Delegate Handler { get; set; }
diff --git a/Perspex.SceneGraph/Media/StreamGeometry.cs b/Perspex.SceneGraph/Media/StreamGeometry.cs
index 9407d9ff22..f2a013d1ad 100644
--- a/Perspex.SceneGraph/Media/StreamGeometry.cs
+++ b/Perspex.SceneGraph/Media/StreamGeometry.cs
@@ -18,6 +18,11 @@ namespace Perspex.Media
             this.PlatformImpl = factory.CreateStreamGeometry();
         }
 
+        private StreamGeometry(IGeometryImpl impl)
+        {
+            this.PlatformImpl = impl;
+        }
+
         public override Rect Bounds
         {
             get { return this.PlatformImpl.Bounds; }
@@ -35,11 +40,6 @@ namespace Perspex.Media
             }
         }
 
-        private StreamGeometry(IGeometryImpl impl)
-        {
-            this.PlatformImpl = impl;
-        }
-
         public override Geometry Clone()
         {
             return new StreamGeometry(((IStreamGeometryImpl)this.PlatformImpl).Clone());
diff --git a/Perspex.SceneGraph/Visual.cs b/Perspex.SceneGraph/Visual.cs
index d20ac28eae..c67698fdb9 100644
--- a/Perspex.SceneGraph/Visual.cs
+++ b/Perspex.SceneGraph/Visual.cs
@@ -113,7 +113,6 @@ namespace Perspex
             }
         }
 
-
         public void InvalidateVisual()
         {
             IRenderRoot root = this.GetSelfAndVisualAncestors()