Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoPropertyAttributeMap.cs
===================================================================
diff -u -r3522 -r3860
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoPropertyAttributeMap.cs	(.../DtoPropertyAttributeMap.cs)	(revision 3522)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoPropertyAttributeMap.cs	(.../DtoPropertyAttributeMap.cs)	(revision 3860)
@@ -51,7 +51,7 @@
             if (!item.PropertyName.HasValidStringValue() || propName != item.PropertyName)
                 throw new DtoPropertyMapException("Property name is empty or doesn't match dictionary property name (key)");
 
-            this.dict.Add(propName, item);
+            dict.Add(propName, item);
         }
 
         /// <summary>
@@ -61,15 +61,15 @@
         /// <returns></returns>
         public bool ContainsKey(string propName)
         {
-            return this.dict.ContainsKey(propName);
+            return dict.ContainsKey(propName);
         }
 
         /// <summary>
         /// Gets the containing keys
         /// </summary>
         public ICollection<string> Keys
         {
-            get { return this.dict.Keys; }
+            get { return dict.Keys; }
         }
 
         /// <summary>
@@ -79,7 +79,7 @@
         /// <returns>Booleand value indicating when the item is successfuly removed</returns>
         public bool Remove(string propName)
         {
-            return this.dict.Remove(propName);
+            return dict.Remove(propName);
         }
 
         /// <summary>
@@ -90,15 +90,15 @@
         /// <returns></returns>
         public bool TryGetValue(string propName, out DtoPropertyAttributeMapping value)
         {
-            return this.dict.TryGetValue(propName, out value);
+            return dict.TryGetValue(propName, out value);
         }
 
         /// <summary>
         /// 
         /// </summary>
         public ICollection<DtoPropertyAttributeMapping> Values
         {
-            get { return this.dict.Values; }
+            get { return dict.Values; }
         }
 
         /// <summary>
@@ -108,8 +108,8 @@
         /// <returns></returns>
         public DtoPropertyAttributeMapping this[string propName]
         {
-            get { return this.dict[propName]; }
-            set { this.dict[propName] = value; }
+            get { return dict[propName]; }
+            set { dict[propName] = value; }
         }
 
         /// <summary>
@@ -118,15 +118,15 @@
         /// <param name="item"></param>
         public void Add(KeyValuePair<string, DtoPropertyAttributeMapping> item)
         {
-            this.dict.Add(item.Key, item.Value);
+            dict.Add(item.Key, item.Value);
         }
 
         /// <summary>
         /// 
         /// </summary>
         public void Clear()
         {
-            this.dict.Clear();
+            dict.Clear();
         }
 
         /// <summary>
@@ -136,7 +136,7 @@
         /// <returns></returns>
         public bool Contains(KeyValuePair<string, DtoPropertyAttributeMapping> item)
         {
-            return ((IDictionary<string, DtoPropertyAttributeMapping>) this.dict).Contains(item);
+            return dict.Contains(item);
         }
 
         /// <summary>
@@ -146,24 +146,18 @@
         /// <param name="arrayIndex"></param>
         public void CopyTo(KeyValuePair<string, DtoPropertyAttributeMapping>[] array, int arrayIndex)
         {
-            ((IDictionary<string, DtoPropertyAttributeMapping>) this.dict).CopyTo(array, arrayIndex);
+            dict.CopyTo(array, arrayIndex);
         }
 
         /// <summary>
         /// 
         /// </summary>
-        public int Count
-        {
-            get { return this.dict.Count; }
-        }
+        public int Count => dict.Count;
 
         /// <summary>
         /// 
         /// </summary>
-        public bool IsReadOnly
-        {
-            get { return false; }
-        }
+        public bool IsReadOnly => false;
 
         /// <summary>
         /// 
@@ -172,7 +166,7 @@
         /// <returns></returns>
         public bool Remove(KeyValuePair<string, DtoPropertyAttributeMapping> item)
         {
-            return this.dict.Remove(item.Key);
+            return dict.Remove(item.Key);
         }
 
         /// <summary>
@@ -181,7 +175,7 @@
         /// <returns></returns>
         public IEnumerator<KeyValuePair<string, DtoPropertyAttributeMapping>> GetEnumerator()
         {
-            return this.dict.GetEnumerator();
+            return dict.GetEnumerator();
         }
 
         /// <summary>
@@ -190,7 +184,7 @@
         /// <returns></returns>
         IEnumerator IEnumerable.GetEnumerator()
         {
-            return (IEnumerator) ((IDictionary<string, DtoPropertyAttributeMapping>) this.dict).GetEnumerator();
+            return dict.GetEnumerator();
         }
 
         #endregion
@@ -204,7 +198,7 @@
             if (item == null)
                 throw new ArgumentNullException("item");
 
-            this.Add(item.PropertyName, item);
+            Add(item.PropertyName, item);
         }
 
         /// <summary>
@@ -213,7 +207,7 @@
         /// <param name="item">The <see cref="DtoPropertyAttributeMapping"/> item to add</param>
         public void AddOrUpdate(string propName, string attrName)
         {
-            this.AddOrUpdate(propName, attrName, DtoPropertyImportance.Optional);
+            AddOrUpdate(propName, attrName, DtoPropertyImportance.Optional);
         }
 
         /// <summary>
@@ -225,7 +219,7 @@
             if (!attrName.HasValidStringValue())
                 throw new DtoPropertyMapException("attrName");
 
-            this.AddOrUpdate(propName,
+            AddOrUpdate(propName,
                              new DtoPropertyAttributeMapping()
                                  {
                                      PropertyName = propName,
@@ -244,7 +238,7 @@
             if (item == null)
                 throw new ArgumentNullException("item");
 
-            this.AddOrUpdate(item.PropertyName, item);
+            AddOrUpdate(item.PropertyName, item);
         }
 
 
@@ -261,13 +255,13 @@
             if (!propName.HasValidStringValue())
                 throw new DtoPropertyMapException("Property name (or key) is empty");
 
-            if (!this.dict.ContainsKey(propName))
+            if (!dict.ContainsKey(propName))
             {
-                this.Add(item.PropertyName, item);
+                Add(item.PropertyName, item);
             }
             else
             {
-                this.dict[propName] = item;
+                dict[propName] = item;
             }
         }
 
@@ -279,7 +273,7 @@
         {
             foreach (DtoPropertyAttributeMapping item in coll)
             {
-                this.AddOrUpdate(item);
+                AddOrUpdate(item);
             }
         }
 
@@ -290,7 +284,7 @@
         /// <returns>The item if found null otherwise</returns>
         public DtoPropertyAttributeMapping GetByPropertyName(string name)
         {
-            return this.GetByPropertyName(name, StringComparison.InvariantCultureIgnoreCase);
+            return GetByPropertyName(name, StringComparison.InvariantCultureIgnoreCase);
         }
 
         /// <summary>
@@ -301,7 +295,7 @@
         /// <returns>The item if found null otherwise</returns>
         public DtoPropertyAttributeMapping GetByPropertyName(string name, StringComparison comparisonType)
         {
-            IEnumerable<DtoPropertyAttributeMapping> q = from x in this.dict.Values
+            IEnumerable<DtoPropertyAttributeMapping> q = from x in dict.Values
                                                          where x.PropertyName.Equals(name, comparisonType)
                                                          select x;
 
@@ -318,7 +312,7 @@
         /// <returns>The item if found null otherwise</returns>
         public DtoPropertyAttributeMapping GetByAttributeName(string name)
         {
-            return this.GetByAttributeName(name, StringComparison.InvariantCultureIgnoreCase);
+            return GetByAttributeName(name, StringComparison.InvariantCultureIgnoreCase);
         }
 
         /// <summary>
@@ -329,7 +323,7 @@
         /// <returns>The item if found null otherwise</returns>
         public DtoPropertyAttributeMapping GetByAttributeName(string name, StringComparison comparisonType)
         {
-            IEnumerable<DtoPropertyAttributeMapping> q = from x in this.dict.Values
+            IEnumerable<DtoPropertyAttributeMapping> q = from x in dict.Values
                                                          where x.AttributeName.Equals(name, comparisonType)
                                                          select x;