Index: Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs
===================================================================
diff -u -r56ec7114c4c96eeee4a1bb16d0ecac2bb10a49b8 -r9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a
--- Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs	(.../DragDropHandler.cs)	(revision 56ec7114c4c96eeee4a1bb16d0ecac2bb10a49b8)
+++ Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs	(.../DragDropHandler.cs)	(revision 9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a)
@@ -310,9 +310,9 @@
                     placeholderLocation = PlaceholderLocation.Middle;
                 }
             }
-            else if (nodeOver.Parent != null
-                     && offsetY > nodeOver.Bounds.Height - nodeOver.Bounds.Height/3
-                     && nodeDragging.PrevNode != nodeOver)
+            else if (nodeOver.Parent != null &&
+                     offsetY > nodeOver.Bounds.Height - nodeOver.Bounds.Height/3 &&
+                     nodeDragging.PrevNode != nodeOver)
             {
                 TreeNodeInfo treeNodeInfo = getTreeNodeInfoForData(nodeOver.Parent.Tag);
                 if (treeNodeInfo.CanInsert != null && treeNodeInfo.CanInsert(nodeDragging.Tag, nodeOver.Parent.Tag))
@@ -330,9 +330,9 @@
                     placeholderLocation = PlaceholderLocation.Middle;
                 }
             }
-            else if (nodeDragging != nodeOver
-                     && offsetY < nodeOver.Bounds.Height - nodeOver.Bounds.Height/4
-                     && offsetY > nodeOver.Bounds.Height/4)
+            else if (nodeDragging != nodeOver &&
+                     offsetY < nodeOver.Bounds.Height - nodeOver.Bounds.Height/4 &&
+                     offsetY > nodeOver.Bounds.Height/4)
             {
                 nodeDropTarget = nodeOver;
                 dropAtLocation = 0;
Index: Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs
===================================================================
diff -u -r8e791325754da4938269fdc3af7ef3c71fbcd402 -r9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a
--- Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs	(.../TreeViewControl.cs)	(revision 8e791325754da4938269fdc3af7ef3c71fbcd402)
+++ Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs	(.../TreeViewControl.cs)	(revision 9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a)
@@ -553,8 +553,8 @@
                                      : Color.FromKnownColor(KnownColor.ControlText);
             SetTreeNodeImageKey(treeNode, treeNodeInfo);
 
-            if (treeNodeInfo.CanCheck != null && treeNodeInfo.CanCheck(treeNode.Tag)
-                && treeNodeInfo.IsChecked != null)
+            if (treeNodeInfo.CanCheck != null && treeNodeInfo.CanCheck(treeNode.Tag) &&
+                treeNodeInfo.IsChecked != null)
             {
                 if (treeNode.Checked != treeNodeInfo.IsChecked(treeNode.Tag))
                 {
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs
===================================================================
diff -u -r5123cc1c54afb3827d844dd312f771de5c037986 -r9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs	(.../MapDataConverter.cs)	(revision 5123cc1c54afb3827d844dd312f771de5c037986)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs	(.../MapDataConverter.cs)	(revision 9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a)
@@ -43,11 +43,11 @@
         where TMapData : MapData
         where TMapFeatureLayer : IMapFeatureLayer
     {
-        /// <summary>
-        /// <remarks>Needed because DotSpatial can't handle special characters.
+        /// <remarks>
+        /// Needed because DotSpatial can't handle special characters.
         /// Therefore we create an id as column name for the data table in the featureSet.
-        /// We need this lookup to match the selected attribute from the MapData with the created id.</remarks>
-        /// </summary>
+        /// We need this lookup to match the selected attribute from the MapData with the created id.
+        /// </remarks>
         private readonly Dictionary<string, string> columnLookup;
 
         /// <summary>
@@ -119,7 +119,7 @@
         /// <summary>
         /// Adds <see cref="MapFeature.MetaData"/> as attributes to the given <see cref="Feature"/> and to the <see cref="IFeatureSet.DataTable"/>.
         /// </summary>
-        /// <param name="ringtoetsMapFeature">The <see cref="MapFeature"/> to get the mete data from.</param>
+        /// <param name="ringtoetsMapFeature">The <see cref="MapFeature"/> to get the meta data from.</param>
         /// <param name="featureSet">The <see cref="IFeatureSet"/> to add the attributes to.</param>
         /// <param name="feature">The <see cref="Feature"/> to add the attributes to.</param>
         protected void AddMetaDataAsAttributes(MapFeature ringtoetsMapFeature, IFeatureSet featureSet, Feature feature)
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs
===================================================================
diff -u -r5123cc1c54afb3827d844dd312f771de5c037986 -r9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs	(.../MapLineDataConverter.cs)	(revision 5123cc1c54afb3827d844dd312f771de5c037986)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs	(.../MapLineDataConverter.cs)	(revision 9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a)
@@ -81,8 +81,7 @@
                                                                .ToArray());
             }
 
-            Point2D[] pointsToConvert =
-            {};
+            var pointsToConvert = new Point2D[0];
             if (mapFeature.MapGeometries.Count() == 1)
             {
                 pointsToConvert = mapFeature.MapGeometries.First().PointCollections.First().ToArray();
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs
===================================================================
diff -u -r5123cc1c54afb3827d844dd312f771de5c037986 -r9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs	(.../MapPolygonDataConverter.cs)	(revision 5123cc1c54afb3827d844dd312f771de5c037986)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs	(.../MapPolygonDataConverter.cs)	(revision 9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a)
@@ -100,8 +100,7 @@
             else
             {
                 ILinearRing shell = null;
-                ILinearRing[] holes =
-                {};
+                var holes = new ILinearRing[0];
 
                 if (geometryList.Count == 1)
                 {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/UseBreakWaterProperties.cs
===================================================================
diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/UseBreakWaterProperties.cs	(.../UseBreakWaterProperties.cs)	(revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/UseBreakWaterProperties.cs	(.../UseBreakWaterProperties.cs)	(revision 9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a)
@@ -119,9 +119,9 @@
         [DynamicReadOnlyValidationMethod]
         public bool DynamicReadOnlyValidationMethod(string propertyName)
         {
-            return data == null
-                   || !propertyName.Equals(TypeUtils.GetMemberName<UseBreakWaterProperties>(i => i.UseBreakWater))
-                   && !UseBreakWater;
+            return data == null ||
+                   !propertyName.Equals(TypeUtils.GetMemberName<UseBreakWaterProperties>(i => i.UseBreakWater)) &&
+                   !UseBreakWater;
         }
 
         public override string ToString()
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs
===================================================================
diff -u -r31d83651ac426afc55ed5796843a2cd5f1770480 -r9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs	(.../RingtoetsMapDataFeaturesFactory.cs)	(revision 31d83651ac426afc55ed5796843a2cd5f1770480)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs	(.../RingtoetsMapDataFeaturesFactory.cs)	(revision 9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a)
@@ -263,8 +263,8 @@
             where T : StructuresInputBase<U>, new()
             where U : StructureBase
         {
-            return calculation.InputParameters.Structure != null
-                   && calculation.InputParameters.HydraulicBoundaryLocation != null;
+            return calculation.InputParameters.Structure != null &&
+                   calculation.InputParameters.HydraulicBoundaryLocation != null;
         }
 
         private static MapFeature CreateFailureMechanismSectionMapFeature(FailureMechanismSection section)
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/CategoryTreeFolderTest.cs
===================================================================
diff -u -r2857b234df4622cdaf80bbc75abc58af36667347 -r9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/CategoryTreeFolderTest.cs	(.../CategoryTreeFolderTest.cs)	(revision 2857b234df4622cdaf80bbc75abc58af36667347)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/CategoryTreeFolderTest.cs	(.../CategoryTreeFolderTest.cs)	(revision 9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a)
@@ -116,8 +116,7 @@
         public void Equals_ObjectToEqualToIsCategoryTreeFolderWithDifferentAmountOfContents_ResultShouldNotBeEqual()
         {
             // Setup
-            var treeFolder1 = new CategoryTreeFolder("<name>", new object[]
-            {});
+            var treeFolder1 = new CategoryTreeFolder("<name>", new object[0]);
             var treeFolder2 = new CategoryTreeFolder("<name>", new[]
             {
                 new object()
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs
===================================================================
diff -u -r416bdb89f8e154bd4108a518d8a3e69f652a6eb0 -r9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs	(.../HydraRingConfigurationService.cs)	(revision 416bdb89f8e154bd4108a518d8a3e69f652a6eb0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs	(.../HydraRingConfigurationService.cs)	(revision 9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a)
@@ -438,8 +438,8 @@
                                               : defaultHydraRingValue
                         },
                         {
-                            "Parameter2", hydraRingVariable.DistributionType != HydraRingDistributionType.Deterministic
-                                          && hydraRingVariable.DeviationType == HydraRingDeviationType.Standard
+                            "Parameter2", hydraRingVariable.DistributionType != HydraRingDistributionType.Deterministic &&
+                                          hydraRingVariable.DeviationType == HydraRingDeviationType.Standard
                                               ? GetHydraRingNullableValue(hydraRingVariable.Variability)
                                               : defaultHydraRingNullValue
                         },
@@ -455,8 +455,8 @@
                             "DeviationType", (int?) hydraRingVariable.DeviationType
                         },
                         {
-                            "CoefficientOfVariation", hydraRingVariable.DistributionType != HydraRingDistributionType.Deterministic
-                                                      && hydraRingVariable.DeviationType == HydraRingDeviationType.Variation
+                            "CoefficientOfVariation", hydraRingVariable.DistributionType != HydraRingDistributionType.Deterministic &&
+                                                      hydraRingVariable.DeviationType == HydraRingDeviationType.Variation
                                                           ? GetHydraRingValue(hydraRingVariable.Variability)
                                                           : defaultHydraRingValue
                         },
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r3df4971064b76a8e789bed245e8851fea72ba085 -r9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 3df4971064b76a8e789bed245e8851fea72ba085)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a)
@@ -809,9 +809,9 @@
 
             var failureMechanismWithSectionResults = failureMechanism as IHasSectionResults<FailureMechanismSectionResult>;
 
-            return failureMechanism != null
-                   && failureMechanismWithSectionResults != null
-                   && ReferenceEquals(viewData, failureMechanismWithSectionResults.SectionResults);
+            return failureMechanism != null &&
+                   failureMechanismWithSectionResults != null &&
+                   ReferenceEquals(viewData, failureMechanismWithSectionResults.SectionResults);
         }
 
         #endregion
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs
===================================================================
diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs	(.../WaveConditionsInput.cs)	(revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs	(.../WaveConditionsInput.cs)	(revision 9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a)
@@ -297,9 +297,9 @@
 
         private static void ValidateBoundaries(RoundedDouble lowerBoundary, RoundedDouble upperBoundary, string exceptionMessage)
         {
-            if (!double.IsNaN(lowerBoundary)
-                && !double.IsNaN(upperBoundary)
-                && lowerBoundary >= upperBoundary)
+            if (!double.IsNaN(lowerBoundary) &&
+                !double.IsNaN(upperBoundary) &&
+                lowerBoundary >= upperBoundary)
             {
                 throw new ArgumentOutOfRangeException(null, exceptionMessage);
             }
@@ -320,9 +320,9 @@
                                                                   ? LowerBoundaryWaterLevels
                                                                   : double.MinValue));
 
-            if (double.IsNaN(upperBoundary)
-                || double.IsNaN(lowerBoundary)
-                || (lowerBoundary >= upperBoundary))
+            if (double.IsNaN(upperBoundary) ||
+                double.IsNaN(lowerBoundary) ||
+                (lowerBoundary >= upperBoundary))
             {
                 return waterLevels;
             }