diff --git a/Shared/World.cs b/Shared/World.cs
index d8eaeeb..79b1524 100644
--- a/Shared/World.cs
+++ b/Shared/World.cs
@@ -31,13 +31,14 @@ namespace SemiColinGames {
   }
 
   class TileFactory {
-    struct TileSetAndPoint {
-      public TileSet tileSet;
-      public Point point;
 
-      public TileSetAndPoint(TileSet tileSet, int x, int y) {
-        this.tileSet = tileSet;
-        point = new Point(x, y);
+    struct TextureSource {
+      public Texture2D texture;
+      public Rectangle source;
+
+      public TextureSource(Texture2D texture, Rectangle source) {
+        this.texture = texture;
+        this.source = source;
       }
     }
 
@@ -55,17 +56,8 @@ namespace SemiColinGames {
         { TileSet.Village,   "tiles/anokolisa/village"   },
       };
 
-    static readonly Dictionary<Terrain, TileSetAndPoint> terrainToTilePosition =
-      new Dictionary<Terrain, TileSetAndPoint>() {
-        { Terrain.Grass,  new TileSetAndPoint(TileSet.Grassland, 3, 0) },
-        { Terrain.GrassL, new TileSetAndPoint(TileSet.Grassland, 2, 0) },
-        { Terrain.GrassR, new TileSetAndPoint(TileSet.Grassland, 4, 0) },
-        { Terrain.Rock,   new TileSetAndPoint(TileSet.Grassland, 3, 1) },
-        { Terrain.RockL,  new TileSetAndPoint(TileSet.Grassland, 1, 2) },
-        { Terrain.RockR,  new TileSetAndPoint(TileSet.Grassland, 5, 2) },
-        { Terrain.Water,  new TileSetAndPoint(TileSet.Grassland, 9, 2) },
-        { Terrain.Block,  new TileSetAndPoint(TileSet.Grassland, 6, 3) },
-      };
+    readonly Dictionary<Terrain, TextureSource> terrainToTexture =
+        new Dictionary<Terrain, TextureSource>();
 
     readonly Texture2D[] textures;
 
@@ -75,18 +67,27 @@ namespace SemiColinGames {
       foreach (TileSet tileSet in tileSets) {
         textures[(int) tileSet] = content.Load<Texture2D>(tileSetToContentPath[tileSet]);
       }
+
+      terrainToTexture[Terrain.Grass] = GetTextureSource(TileSet.Grassland, 3, 0);
+      terrainToTexture[Terrain.GrassL] = GetTextureSource(TileSet.Grassland, 2, 0);
+      terrainToTexture[Terrain.GrassR] = GetTextureSource(TileSet.Grassland, 4, 0);
+      terrainToTexture[Terrain.Rock] = GetTextureSource(TileSet.Grassland, 3, 1);
+      terrainToTexture[Terrain.RockL] = GetTextureSource(TileSet.Grassland, 1, 2);
+      terrainToTexture[Terrain.RockR] = GetTextureSource(TileSet.Grassland, 5, 2);
+      terrainToTexture[Terrain.Water] = GetTextureSource(TileSet.Grassland, 9, 2);
+      terrainToTexture[Terrain.Block] = GetTextureSource(TileSet.Grassland, 6, 3);
     }
 
     public Tile MakeTile(Terrain terrain, Rectangle position) {
-      TileSet tileSet = terrainToTilePosition[terrain].tileSet;
-      Texture2D texture = textures[(int) tileSet];
-      return new Tile(terrain, position, texture, TextureSource(terrain));
+      TextureSource textureSource = terrainToTexture[terrain];
+      return new Tile(terrain, position, textureSource.texture, textureSource.source);
     }
 
-    private static Rectangle TextureSource(Terrain terrain) {
+    private TextureSource GetTextureSource(TileSet tileSet, int x, int y) {
+      Texture2D texture = textures[(int) tileSet];
       int size = World.TileSize;
-      Point pos = terrainToTilePosition[terrain].point;
-      return new Rectangle(pos.X * size, pos.Y * size, size, size);
+      Rectangle position = new Rectangle(x * size, y * size, size, size);
+      return new TextureSource(texture, position);
     }
   }