Index: Core/Common/src/Core.Common.Gui/FileFilterGenerator.cs
===================================================================
diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -rb8912fd466037a40d06c19dc867f97cfeca71ac6
--- Core/Common/src/Core.Common.Gui/FileFilterGenerator.cs	(.../FileFilterGenerator.cs)	(revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e)
+++ Core/Common/src/Core.Common.Gui/FileFilterGenerator.cs	(.../FileFilterGenerator.cs)	(revision b8912fd466037a40d06c19dc867f97cfeca71ac6)
@@ -98,7 +98,7 @@
             }
         }
 
-        protected bool Equals(FileFilterGenerator other)
+        private bool Equals(FileFilterGenerator other)
         {
             return string.Equals(extension, other.extension) && string.Equals(description, other.description);
         }
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs
===================================================================
diff -u -ra1bba29ba0d84061cca88da8324957087d564db9 -rb8912fd466037a40d06c19dc867f97cfeca71ac6
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs	(.../RingtoetsMapDataFeaturesFactory.cs)	(revision a1bba29ba0d84061cca88da8324957087d564db9)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs	(.../RingtoetsMapDataFeaturesFactory.cs)	(revision b8912fd466037a40d06c19dc867f97cfeca71ac6)
@@ -292,10 +292,10 @@
             where T : StructuresInputBase<U>, new()
             where U : StructureBase
         {
-            if ((calculations != null && calculations.Any()))
+            if (calculations != null && calculations.Any())
             {
-                MapCalculationData[] calculationData = Enumerable.ToArray(calculations.Where(CalculationHasStructureAndHydraulicBoundaryLocation<T, U>)
-                                                                                      .Select(CreatemapCalculationData<T, U>));
+                MapCalculationData[] calculationData = calculations.Where(CalculationHasStructureAndHydraulicBoundaryLocation<T, U>)
+                                                                   .Select(CreatemapCalculationData<T, U>).ToArray();
 
                 return CreateCalculationFeatures(calculationData);
             }
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Helpers/DistributionConversionExtensionsTest.cs
===================================================================
diff -u -ra1bba29ba0d84061cca88da8324957087d564db9 -rb8912fd466037a40d06c19dc867f97cfeca71ac6
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Helpers/DistributionConversionExtensionsTest.cs	(.../DistributionConversionExtensionsTest.cs)	(revision a1bba29ba0d84061cca88da8324957087d564db9)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Helpers/DistributionConversionExtensionsTest.cs	(.../DistributionConversionExtensionsTest.cs)	(revision b8912fd466037a40d06c19dc867f97cfeca71ac6)
@@ -128,16 +128,16 @@
             mocks.ReplayAll();
 
             var random = new Random(21);
-            RoundedDouble StandardDeviation = random.NextRoundedDouble();
+            RoundedDouble standardDeviation = random.NextRoundedDouble();
 
-            distribution.StandardDeviation = StandardDeviation;
+            distribution.StandardDeviation = standardDeviation;
 
             // Call
             StochastConfiguration configuration = distribution.ToStochastConfigurationWithStandardDeviation();
 
             // Assert
             Assert.IsNull(configuration.Mean);
-            Assert.AreEqual(StandardDeviation, configuration.StandardDeviation);
+            Assert.AreEqual(standardDeviation, configuration.StandardDeviation);
         }
 
         [Test]
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/StochasticSoilProfile.cs
===================================================================
diff -u -r6afbb616ce84cccaf56617d60c5cd821b00daab0 -rb8912fd466037a40d06c19dc867f97cfeca71ac6
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/StochasticSoilProfile.cs	(.../StochasticSoilProfile.cs)	(revision 6afbb616ce84cccaf56617d60c5cd821b00daab0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/StochasticSoilProfile.cs	(.../StochasticSoilProfile.cs)	(revision b8912fd466037a40d06c19dc867f97cfeca71ac6)
@@ -149,7 +149,7 @@
             }
         }
 
-        protected bool Equals(StochasticSoilProfile other)
+        private bool Equals(StochasticSoilProfile other)
         {
             return Probability.Equals(other.Probability)
                    && SoilProfileType == other.SoilProfileType
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile1DReaderTest.cs
===================================================================
diff -u -rf817bfc2122cfa0a48bd19ad8518a948dfd7c95c -rb8912fd466037a40d06c19dc867f97cfeca71ac6
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile1DReaderTest.cs	(.../SoilProfile1DReaderTest.cs)	(revision f817bfc2122cfa0a48bd19ad8518a948dfd7c95c)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile1DReaderTest.cs	(.../SoilProfile1DReaderTest.cs)	(revision b8912fd466037a40d06c19dc867f97cfeca71ac6)
@@ -67,7 +67,7 @@
             // Assert
             var exception = Assert.Throws<CriticalFileReadException>(test);
             string expectedMessage = new FileReaderErrorMessageBuilder(path)
-                .WithSubject(string.Format("ondergrondschematisatie '{0}'", profileName))
+                .WithSubject($"ondergrondschematisatie '{profileName}'")
                 .Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database.");
             Assert.AreEqual(expectedMessage, exception.Message);
 
@@ -94,7 +94,7 @@
             // Assert
             var exception = Assert.Throws<PipingSoilProfileReadException>(test);
             string expectedMessage = new FileReaderErrorMessageBuilder(path)
-                .WithSubject(string.Format("ondergrondschematisatie '{0}'", profileName))
+                .WithSubject($"ondergrondschematisatie '{profileName}'")
                 .Build("Ondergrondschematisatie bevat geen geldige waarde in kolom 'Bottom'.");
             Assert.AreEqual(expectedMessage, exception.Message);
 
@@ -119,7 +119,7 @@
             // Assert
             var exception = Assert.Throws<PipingSoilProfileReadException>(test);
             string expectedMessage = new FileReaderErrorMessageBuilder(path)
-                .WithSubject(string.Format("ondergrondschematisatie '{0}'", profileName))
+                .WithSubject($"ondergrondschematisatie '{profileName}'")
                 .Build("Geen lagen gevonden voor de ondergrondschematisatie.");
             Assert.AreEqual(expectedMessage, exception.Message);
 
@@ -145,7 +145,7 @@
             // Assert
             var exception = Assert.Throws<PipingSoilProfileReadException>(test);
             string expectedMessage = new FileReaderErrorMessageBuilder(path)
-                .WithSubject(string.Format("ondergrondschematisatie '{0}'", profileName))
+                .WithSubject($"ondergrondschematisatie '{profileName}'")
                 .Build("Ondergrondschematisatie bevat geen geldige waarde in kolom 'IsAquifer'.");
             Assert.AreEqual(expectedMessage, exception.Message);
 
@@ -354,7 +354,7 @@
             mocks.VerifyAll();
         }
 
-        private void SetExpectations(int layerCount, string profileName, double bottom, double top, double? isAquifer, string materialName, double? color, double? belowPhreaticLevelMean, double? belowPhreaticLevelDeviation, double? diameterD70Mean, double? DiameterD70CoefficientOfVariation, double? permeabilityMean, double? permeabilityCoefficientOfVariation)
+        private void SetExpectations(int layerCount, string profileName, double bottom, double top, double? isAquifer, string materialName, double? color, double? belowPhreaticLevelMean, double? belowPhreaticLevelDeviation, double? diameterD70Mean, double? diameterD70CoefficientOfVariation, double? permeabilityMean, double? permeabilityCoefficientOfVariation)
         {
             reader.Expect(r => r.Read<long>(SoilProfileTableColumns.LayerCount)).Return(layerCount).Repeat.Any();
             reader.Expect(r => r.Read<string>(SoilProfileTableColumns.ProfileName)).Return(profileName).Repeat.Any();
@@ -373,7 +373,7 @@
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableColumns.DiameterD70Distribution)).Return(logNormalDistribution).Repeat.Any();
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableColumns.DiameterD70Shift)).Return(logNormalShift).Repeat.Any();
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableColumns.DiameterD70Mean)).Return(diameterD70Mean).Repeat.Any();
-            reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableColumns.DiameterD70CoefficientOfVariation)).Return(DiameterD70CoefficientOfVariation).Repeat.Any();
+            reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableColumns.DiameterD70CoefficientOfVariation)).Return(diameterD70CoefficientOfVariation).Repeat.Any();
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableColumns.PermeabilityDistribution)).Return(logNormalDistribution).Repeat.Any();
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableColumns.PermeabilityShift)).Return(logNormalShift).Repeat.Any();
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableColumns.PermeabilityMean)).Return(permeabilityMean).Repeat.Any();
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile2DReaderTest.cs
===================================================================
diff -u -rf817bfc2122cfa0a48bd19ad8518a948dfd7c95c -rb8912fd466037a40d06c19dc867f97cfeca71ac6
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile2DReaderTest.cs	(.../SoilProfile2DReaderTest.cs)	(revision f817bfc2122cfa0a48bd19ad8518a948dfd7c95c)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile2DReaderTest.cs	(.../SoilProfile2DReaderTest.cs)	(revision b8912fd466037a40d06c19dc867f97cfeca71ac6)
@@ -127,7 +127,8 @@
 
             // Assert
             var exception = Assert.Throws<PipingSoilProfileReadException>(test);
-            string expectedMessage = GetExpectedSoilProfileReaderErrorMessage(path, name, string.Format("Geen geldige X waarde gevonden om intersectie te maken uit 2D profiel '{0}'.", name));
+            string errorMessage = $"Geen geldige X waarde gevonden om intersectie te maken uit 2D profiel '{name}'.";
+            string expectedMessage = GetExpectedSoilProfileReaderErrorMessage(path, name, errorMessage);
             Assert.AreEqual(expectedMessage, exception.Message);
 
             mocks.VerifyAll();
@@ -435,7 +436,7 @@
             mocks.VerifyAll();
         }
 
-        private void SetExpectations(int layerCount, string profileName, double intersectionX, double? isAquifer, string materialName, double? color, byte[] geometry, double? belowPhreaticLevelMean, double? belowPhreaticLevelDeviation, double? diameterD70Mean, double? DiameterD70CoefficientOfVariation, double? permeabilityMean, double? permeabilityCoefficientOfVariation)
+        private void SetExpectations(int layerCount, string profileName, double intersectionX, double? isAquifer, string materialName, double? color, byte[] geometry, double? belowPhreaticLevelMean, double? belowPhreaticLevelDeviation, double? diameterD70Mean, double? diameterD70CoefficientOfVariation, double? permeabilityMean, double? permeabilityCoefficientOfVariation)
         {
             reader.Expect(r => r.Read<long>(SoilProfileTableColumns.LayerCount)).Return(layerCount).Repeat.Any();
             reader.Expect(r => r.Read<string>(SoilProfileTableColumns.ProfileName)).Return(profileName).Repeat.Any();
@@ -454,7 +455,7 @@
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableColumns.DiameterD70Distribution)).Return(logNormalDistribution).Repeat.Any();
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableColumns.DiameterD70Shift)).Return(logNormalShift).Repeat.Any();
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableColumns.DiameterD70Mean)).Return(diameterD70Mean).Repeat.Any();
-            reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableColumns.DiameterD70CoefficientOfVariation)).Return(DiameterD70CoefficientOfVariation).Repeat.Any();
+            reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableColumns.DiameterD70CoefficientOfVariation)).Return(diameterD70CoefficientOfVariation).Repeat.Any();
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableColumns.PermeabilityDistribution)).Return(logNormalDistribution).Repeat.Any();
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableColumns.PermeabilityShift)).Return(logNormalShift).Repeat.Any();
             reader.Expect(r => r.ReadOrDefault<double?>(SoilProfileTableColumns.PermeabilityMean)).Return(permeabilityMean).Repeat.Any();
@@ -464,7 +465,7 @@
         private static string GetExpectedSoilProfileReaderErrorMessage(string path, string name, string errorMessage)
         {
             return new FileReaderErrorMessageBuilder(path)
-                .WithSubject(string.Format("ondergrondschematisatie '{0}'", name))
+                .WithSubject($"ondergrondschematisatie '{name}'")
                 .Build(errorMessage);
         }
     }