Index: src/Common/DelftTools.Utils/Collections/EnumerableExtensions.cs
===================================================================
diff -u -r325410362b50750d3c291d19c1526799c9b1c583 -rfe0228504fc61d6af56be4c0f6a8fc28690f9064
--- src/Common/DelftTools.Utils/Collections/EnumerableExtensions.cs	(.../EnumerableExtensions.cs)	(revision 325410362b50750d3c291d19c1526799c9b1c583)
+++ src/Common/DelftTools.Utils/Collections/EnumerableExtensions.cs	(.../EnumerableExtensions.cs)	(revision fe0228504fc61d6af56be4c0f6a8fc28690f9064)
@@ -14,13 +14,11 @@
         /// <returns></returns>
         public static Type GetInnerType(this IEnumerable source)
         {
-            Type inner = null;
-
             foreach (var item in source)
             {
                 return item.GetType();
             }
-            return inner;
+            return null;
         }
 
         /// <summary>
Index: src/Common/NetTopologySuite/IO/GeoTools/Dbase/DbaseFileReader.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rfe0228504fc61d6af56be4c0f6a8fc28690f9064
--- src/Common/NetTopologySuite/IO/GeoTools/Dbase/DbaseFileReader.cs	(.../DbaseFileReader.cs)	(revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Common/NetTopologySuite/IO/GeoTools/Dbase/DbaseFileReader.cs	(.../DbaseFileReader.cs)	(revision fe0228504fc61d6af56be4c0f6a8fc28690f9064)
@@ -24,7 +24,7 @@
         {
             if (filename == null)
             {
-                throw new ArgumentNullException(filename);
+                throw new ArgumentNullException("filename");
             }
             // check for the file existing here, otherwise we will not get an error
             //until we read the first record or read the header.
Index: src/DeltaShell/DeltaShell.Gui/GuiCommandHandler.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rfe0228504fc61d6af56be4c0f6a8fc28690f9064
--- src/DeltaShell/DeltaShell.Gui/GuiCommandHandler.cs	(.../GuiCommandHandler.cs)	(revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/DeltaShell/DeltaShell.Gui/GuiCommandHandler.cs	(.../GuiCommandHandler.cs)	(revision fe0228504fc61d6af56be4c0f6a8fc28690f9064)
@@ -155,12 +155,7 @@
             }
 
             var projectItemActiveView = activeView.Data as IProjectItem;
-            if (projectItemActiveView != null)
-            {
-                return projectItemActiveView;
-            }
-
-            return null;
+            return projectItemActiveView;
         }
 
         public bool SaveProject()
Index: src/DeltaShell/DeltaShell.Gui/GuiExportHandler.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rfe0228504fc61d6af56be4c0f6a8fc28690f9064
--- src/DeltaShell/DeltaShell.Gui/GuiExportHandler.cs	(.../GuiExportHandler.cs)	(revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/DeltaShell/DeltaShell.Gui/GuiExportHandler.cs	(.../GuiExportHandler.cs)	(revision fe0228504fc61d6af56be4c0f6a8fc28690f9064)
@@ -112,9 +112,9 @@
             var dlg = new SaveFileDialog
             {
                 Filter = exporter.FileFilter,
-                Title = Resources.GuiExportHandler_ExporterItemUsingFileOpenDialog_Select_a_file_to_export_to
+                Title = Resources.GuiExportHandler_ExporterItemUsingFileOpenDialog_Select_a_file_to_export_to,
+                FilterIndex = 2
             };
-            dlg.FilterIndex = 2;
             if (dlg.ShowDialog() == DialogResult.OK)
             {
                 if (exporter.Export(item, dlg.FileName))
Index: src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Commands/MapAddLayerCommand.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rfe0228504fc61d6af56be4c0f6a8fc28690f9064
--- src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Commands/MapAddLayerCommand.cs	(.../MapAddLayerCommand.cs)	(revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Commands/MapAddLayerCommand.cs	(.../MapAddLayerCommand.cs)	(revision fe0228504fc61d6af56be4c0f6a8fc28690f9064)
@@ -45,13 +45,8 @@
             {};
         }
 
-        public void AddLayerFromFile(string path)
+        public void AddLayerFromFile(string path, Map mapToUse = null)
         {
-            AddLayerFromFile(path, null);
-        }
-
-        public void AddLayerFromFile(string path, Map mapToUse)
-        {
             Map map = null;
 
             if (MapView != null)
Index: src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Commands/MapAddWmsLayerCommand.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rfe0228504fc61d6af56be4c0f6a8fc28690f9064
--- src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Commands/MapAddWmsLayerCommand.cs	(.../MapAddWmsLayerCommand.cs)	(revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/DeltaShell/DeltaShell.Plugins.SharpMapGis.Gui/Commands/MapAddWmsLayerCommand.cs	(.../MapAddWmsLayerCommand.cs)	(revision fe0228504fc61d6af56be4c0f6a8fc28690f9064)
@@ -27,9 +27,11 @@
 
             try
             {
-                WmsLayer layer = new WmsLayer(url, url);
-                layer.TimeOut = 100000;
-                layer.SpatialReferenceSystem = "EPSG:4326";
+                WmsLayer layer = new WmsLayer(url, url)
+                {
+                    TimeOut = 100000,
+                    SpatialReferenceSystem = "EPSG:4326"
+                };
                 foreach (Client.WmsServerLayer childLayer in layer.RootLayer.ChildLayers)
                 {
                     // no visible by default
@@ -47,8 +49,10 @@
 
         protected override void OnExecute(params object[] arguments)
         {
-            var openUrlDialog = new OpenUrlDialog();
-            openUrlDialog.Url = "http://www2.demis.nl/wms/wms.asp?wms=WorldMap&REQUEST=GetCapabilities";
+            var openUrlDialog = new OpenUrlDialog
+            {
+                Url = "http://www2.demis.nl/wms/wms.asp?wms=WorldMap&REQUEST=GetCapabilities"
+            };
 
             if (openUrlDialog.ShowDialog() == DialogResult.OK)
             {
Index: src/DeltaShell/DeltaShell.Plugins.SharpMapGis/HibernateMappings/ThemeTypeConverter.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rfe0228504fc61d6af56be4c0f6a8fc28690f9064
--- src/DeltaShell/DeltaShell.Plugins.SharpMapGis/HibernateMappings/ThemeTypeConverter.cs	(.../ThemeTypeConverter.cs)	(revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/DeltaShell/DeltaShell.Plugins.SharpMapGis/HibernateMappings/ThemeTypeConverter.cs	(.../ThemeTypeConverter.cs)	(revision fe0228504fc61d6af56be4c0f6a8fc28690f9064)
@@ -632,9 +632,11 @@
             var fillColorBlends = new List<colorBlend>();
             for (int i = 0; i < colorBlend.Positions.Length; i++)
             {
-                var fillBlend = new colorBlend();
-                fillBlend.color = ColorTranslator.ToHtml(colorBlend.Colors[i]);
-                fillBlend.position = colorBlend.Positions[i];
+                var fillBlend = new colorBlend
+                {
+                    color = ColorTranslator.ToHtml(colorBlend.Colors[i]),
+                    position = colorBlend.Positions[i]
+                };
                 fillColorBlends.Add(fillBlend);
             }
             return fillColorBlends.ToArray();
Index: src/Plugins/Wti/Wti.Forms/NodePresenters/PipingDataNodePresenter.cs
===================================================================
diff -u -r5f7007ed48dccd78b0a07db987bf234a6705ec9b -rfe0228504fc61d6af56be4c0f6a8fc28690f9064
--- src/Plugins/Wti/Wti.Forms/NodePresenters/PipingDataNodePresenter.cs	(.../PipingDataNodePresenter.cs)	(revision 5f7007ed48dccd78b0a07db987bf234a6705ec9b)
+++ src/Plugins/Wti/Wti.Forms/NodePresenters/PipingDataNodePresenter.cs	(.../PipingDataNodePresenter.cs)	(revision fe0228504fc61d6af56be4c0f6a8fc28690f9064)
@@ -4,7 +4,6 @@
 using DelftTools.Controls;
 using DelftTools.Controls.Swf;
 using DelftTools.Utils.Collections;
-using log4net;
 using Wti.Data;
 using Wti.Forms.Properties;
 using Wti.Service;
Index: src/Plugins/Wti/Wti.IO/PipingSurfaceLinesCsvReader.cs
===================================================================
diff -u -rc42d0c47753135357002db6026ebbefc3603a62b -rfe0228504fc61d6af56be4c0f6a8fc28690f9064
--- src/Plugins/Wti/Wti.IO/PipingSurfaceLinesCsvReader.cs	(.../PipingSurfaceLinesCsvReader.cs)	(revision c42d0c47753135357002db6026ebbefc3603a62b)
+++ src/Plugins/Wti/Wti.IO/PipingSurfaceLinesCsvReader.cs	(.../PipingSurfaceLinesCsvReader.cs)	(revision fe0228504fc61d6af56be4c0f6a8fc28690f9064)
@@ -111,8 +111,10 @@
                     };
                 }
 
-                var surfaceLine = new PipingSurfaceLine();
-                surfaceLine.Name = tokenizedString.First();
+                var surfaceLine = new PipingSurfaceLine
+                {
+                    Name = tokenizedString.First()
+                };
                 surfaceLine.SetGeometry(points);
                 return surfaceLine;
             }
Index: test/Plugins/Wti/Wti.Service.Test/PipingCalculationServiceTest.cs
===================================================================
diff -u -r97ebda114265b9ccdc6cf73bab8312e5422e3de4 -rfe0228504fc61d6af56be4c0f6a8fc28690f9064
--- test/Plugins/Wti/Wti.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision 97ebda114265b9ccdc6cf73bab8312e5422e3de4)
+++ test/Plugins/Wti/Wti.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision fe0228504fc61d6af56be4c0f6a8fc28690f9064)
@@ -1,5 +1,4 @@
 using NUnit.Framework;
-using Rhino.Mocks;
 using Wti.Calculation.Test.Piping.Stub;
 using Wti.Data;