diff --git a/Shared/Clock.cs b/Shared/Clock.cs
index 7a35db8..087437e 100644
--- a/Shared/Clock.cs
+++ b/Shared/Clock.cs
@@ -2,14 +2,12 @@
 
 namespace SemiColinGames {
   class Clock {
-    private static TimeSpan modelTime = new TimeSpan();
-
     public static void AddModelTime(double seconds) {
-      modelTime += TimeSpan.FromSeconds(seconds);
+      ModelTime += TimeSpan.FromSeconds(seconds);
     }
 
     public static TimeSpan ModelTime {
-      get { return modelTime; }
+      get; private set;
     }
   }
 }
diff --git a/Shared/World.cs b/Shared/World.cs
index eb29f76..cf59a79 100644
--- a/Shared/World.cs
+++ b/Shared/World.cs
@@ -21,8 +21,8 @@ namespace SemiColinGames {
 
     public Tile(Texture2D texture, Terrain terrain, Rectangle position) {
       this.texture = texture;
-      this.Terrain = terrain;
-      this.Position = position;
+      Terrain = terrain;
+      Position = position;
     }
 
     public Rectangle Position { get; private set; }