Index: Core/Components/src/Core.Components.DotSpatial/Converter/IMapDataConverter.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r7cb5faabd65fb50c17f40c75b76fbd17714cca82
--- Core/Components/src/Core.Components.DotSpatial/Converter/IMapDataConverter.cs	(.../IMapDataConverter.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/IMapDataConverter.cs	(.../IMapDataConverter.cs)	(revision 7cb5faabd65fb50c17f40c75b76fbd17714cca82)
@@ -35,8 +35,8 @@
         /// Checks whether the <see cref="IMapDataConverter"/> can convert the <paramref name="data"/>.
         /// </summary>
         /// <param name="data">The <see cref="MapData"/> to check for.</param>
-        /// <returns><c>True</c> if the <paramref name="data"/> can be converter by the
-        /// <see cref="IMapDataConverter"/>, <c>false</c> otheriwse.</returns>
+        /// <returns><c>true</c> if the <paramref name="data"/> can be converted by the
+        /// <see cref="IMapDataConverter"/>, <c>false</c> otherwise.</returns>
         bool CanConvertMapData(MapData data);
 
         /// <summary>
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapDataCollectionConverter.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r7cb5faabd65fb50c17f40c75b76fbd17714cca82
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapDataCollectionConverter.cs	(.../MapDataCollectionConverter.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapDataCollectionConverter.cs	(.../MapDataCollectionConverter.cs)	(revision 7cb5faabd65fb50c17f40c75b76fbd17714cca82)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System.Collections.Generic;
+using System.Linq;
 using Core.Components.DotSpatial.Data;
 using DotSpatial.Data;
 
@@ -33,12 +34,8 @@
         protected override IList<FeatureSet> Convert(MapDataCollection data)
         {
             var factory = new MapDataFactory();
-            var featureSets = new List<FeatureSet>();
-            foreach (var mapData in data.List)
-            {
-                featureSets.AddRange(factory.Create(mapData));
-            }
-            return featureSets;
+
+            return data.List.SelectMany(md => factory.Create(md)).ToList();
         }
     }
 }
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r7cb5faabd65fb50c17f40c75b76fbd17714cca82
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs	(.../MapLineDataConverter.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs	(.../MapLineDataConverter.cs)	(revision 7cb5faabd65fb50c17f40c75b76fbd17714cca82)
@@ -28,25 +28,22 @@
 namespace Core.Components.DotSpatial.Converter
 {
     /// <summary>
-    /// The converter that converts <see cref="MapLineData"/> into a <see cref="FeatureSet"/> containing <see cref="LineString"/>.
+    /// The converter that converts <see cref="MapLineData"/> into a <see cref="FeatureSet"/> containing a <see cref="LineString"/>.
     /// </summary>
     public class MapLineDataConverter : MapDataConverter<MapLineData>
     {
         protected override IList<FeatureSet> Convert(MapLineData data)
         {
-            var points = data.Points.ToList();
+            var coordinates = data.Points.Select(p => new Coordinate(p.Item1, p.Item2));
+            var lineString = new LineString(coordinates);
             var featureSet = new FeatureSet(FeatureType.Line);
 
-            Coordinate[] coordinates = new Coordinate[points.Count()];
-            for (int i = 0; i < points.Count(); i++)
-            {
-                coordinates[i] = new Coordinate(points[i].Item1, points[i].Item2);
-            }
-            var lineString = new LineString(coordinates);
-            var feature = new Feature(lineString);
-            featureSet.Features.Add(feature);
+            featureSet.Features.Add(lineString);
 
-            return new List<FeatureSet> { featureSet };
+            return new List<FeatureSet>
+            {
+                featureSet
+            };
         }
     }
 }
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r7cb5faabd65fb50c17f40c75b76fbd17714cca82
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs	(.../MapPointDataConverter.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs	(.../MapPointDataConverter.cs)	(revision 7cb5faabd65fb50c17f40c75b76fbd17714cca82)
@@ -27,7 +27,7 @@
 namespace Core.Components.DotSpatial.Converter
 {
     /// <summary>
-    /// The converter that converts <see cref="MapPointData"/> into <see cref="FeatureType.Point"/> <see cref="FeatureSet"/>.
+    /// The converter that converts <see cref="MapPointData"/> into a <see cref="FeatureSet"/> containing one or more <see cref="Coordinate"/>.
     /// </summary>
     public class MapPointDataConverter : MapDataConverter<MapPointData>
     {
@@ -37,8 +37,7 @@
 
             foreach (var point in data.Points)
             {
-                var coordinate = new Coordinate(point.Item1, point.Item2);
-                featureSet.Features.Add(coordinate);
+                featureSet.Features.Add(new Coordinate(point.Item1, point.Item2));
             }
 
             return new List<FeatureSet> { featureSet };
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r7cb5faabd65fb50c17f40c75b76fbd17714cca82
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs	(.../MapPolygonDataConverter.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs	(.../MapPolygonDataConverter.cs)	(revision 7cb5faabd65fb50c17f40c75b76fbd17714cca82)
@@ -19,9 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using Core.Components.DotSpatial.Data;
 using DotSpatial.Data;
@@ -30,25 +28,22 @@
 namespace Core.Components.DotSpatial.Converter
 {
     /// <summary>
-    /// The converter that converts <see cref="MapPolygonData"/> into <see cref="FeatureSet"/> containing <see cref="Polygon"/>.
+    /// The converter that converts <see cref="MapPolygonData"/> into a <see cref="FeatureSet"/> containing a <see cref="Polygon"/>.
     /// </summary>
     public class MapPolygonDataConverter : MapDataConverter<MapPolygonData>
     {
         protected override IList<FeatureSet> Convert(MapPolygonData data)
         {
+            var coordinates = data.Points.Select(p => new Coordinate(p.Item1, p.Item2));
+            var polygon = new Polygon(coordinates);
             var featureSet = new FeatureSet(FeatureType.Polygon);
 
-            var points = data.Points.ToArray();
-
-            var coordinates = new Collection<Coordinate>();
-            for (int i = 0; i < points.Length; i++)
-            {
-                coordinates.Add(new Coordinate(points[i].Item1, points[i].Item2));
-            }
-            var polygon = new Polygon(coordinates);
             featureSet.Features.Add(polygon);
 
-            return new List<FeatureSet> { featureSet };
+            return new List<FeatureSet>
+            {
+                featureSet
+            };
         }
     }
 }