Index: Core/Components/src/Core.Components.Gis.IO/Readers/ShapeFileReaderBase.cs
===================================================================
diff -u -rc1e1d694963b43731dbc4ef8bfd589467f459c46 -ra8744fa1e115c1317d15a3f5784474aacaf2227d
--- Core/Components/src/Core.Components.Gis.IO/Readers/ShapeFileReaderBase.cs	(.../ShapeFileReaderBase.cs)	(revision c1e1d694963b43731dbc4ef8bfd589467f459c46)
+++ Core/Components/src/Core.Components.Gis.IO/Readers/ShapeFileReaderBase.cs	(.../ShapeFileReaderBase.cs)	(revision a8744fa1e115c1317d15a3f5784474aacaf2227d)
@@ -146,6 +146,7 @@
                         newValue = dataRowValue;
                     }
                 }
+
                 targetFeature.MetaData[column.ColumnName] = newValue;
             }
         }
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsTreeNodeInfoFactory.cs
===================================================================
diff -u -raabaa33e54f9ebb10c850d7d8964dc0a692e5535 -ra8744fa1e115c1317d15a3f5784474aacaf2227d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsTreeNodeInfoFactory.cs	(.../RingtoetsTreeNodeInfoFactory.cs)	(revision aabaa33e54f9ebb10c850d7d8964dc0a692e5535)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsTreeNodeInfoFactory.cs	(.../RingtoetsTreeNodeInfoFactory.cs)	(revision a8744fa1e115c1317d15a3f5784474aacaf2227d)
@@ -196,9 +196,13 @@
         /// </summary>
         private abstract class DroppingCalculationInContainerStrategy
         {
-            protected readonly CalculationGroup TargetCalculationGroup;
             private readonly CalculationGroup sourceCalculationGroup;
 
+            /// <summary>
+            /// Creates a new instance of <see cref="DroppingCalculationInContainerStrategy"/>.
+            /// </summary>
+            /// <param name="sourceCalculationGroup">The source <see cref="CalculationGroup"/>.</param>
+            /// <param name="targetCalculationGroup">The target <see cref="CalculationGroup"/>.</param>
             protected DroppingCalculationInContainerStrategy(CalculationGroup sourceCalculationGroup, CalculationGroup targetCalculationGroup)
             {
                 this.sourceCalculationGroup = sourceCalculationGroup;
@@ -220,6 +224,11 @@
             }
 
             /// <summary>
+            /// Gets the target <see cref="CalculationGroup"/>.
+            /// </summary>
+            protected CalculationGroup TargetCalculationGroup { get; }
+
+            /// <summary>
             /// Moves the <see cref="ICalculationBase"/> instance to its new location.
             /// </summary>
             /// <param name="calculationBase">The instance to be relocated.</param>
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/StructuresCalculationStochastAssigner.cs
===================================================================
diff -u -r7c3fee822d908135cf99bb6cf2803982b257d409 -ra8744fa1e115c1317d15a3f5784474aacaf2227d
--- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/StructuresCalculationStochastAssigner.cs	(.../StructuresCalculationStochastAssigner.cs)	(revision 7c3fee822d908135cf99bb6cf2803982b257d409)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/StructuresCalculationStochastAssigner.cs	(.../StructuresCalculationStochastAssigner.cs)	(revision a8744fa1e115c1317d15a3f5784474aacaf2227d)
@@ -44,11 +44,6 @@
     {
         protected static readonly ILog Log = LogManager.GetLogger(typeof(StructuresCalculationStochastAssigner<TConfiguration, TInput, TStructure>));
 
-        /// <summary>
-        /// The configuration that is used for stochast parameter source.
-        /// </summary>
-        protected readonly TConfiguration Configuration;
-
         private readonly StructuresCalculation<TInput> calculation;
 
         /// <summary>
@@ -65,10 +60,12 @@
             {
                 throw new ArgumentNullException(nameof(configuration));
             }
+
             if (calculation == null)
             {
                 throw new ArgumentNullException(nameof(calculation));
             }
+
             Configuration = configuration;
             this.calculation = calculation;
         }
@@ -87,6 +84,11 @@
         }
 
         /// <summary>
+        /// Gets the configuration that is used for stochast parameter source.
+        /// </summary>
+        protected TConfiguration Configuration { get; }
+
+        /// <summary>
         /// Performs additional validations for structure specific stochasts.
         /// </summary>
         /// <returns><c>true</c> if no errors were found, <c>false</c> otherwise.</returns>
@@ -172,13 +174,15 @@
                                                   Configuration.Name);
                 return false;
             }
+
             if (Configuration.ModelFactorSuperCriticalFlow?.StandardDeviation != null
                 || Configuration.ModelFactorSuperCriticalFlow?.VariationCoefficient != null)
             {
                 Log.LogCalculationConversionError(Resources.CalculationConfigurationImporter_ValidateStochasts_Cannot_define_spread_for_ModelFactorSuperCriticalFlow,
                                                   Configuration.Name);
                 return false;
             }
+
             return true;
         }
 
@@ -188,6 +192,7 @@
             {
                 yield return Tuple.Create(stochastDefinition.StochastName, stochastDefinition.Configuration);
             }
+
             foreach (VariationCoefficientDefinition stochastDefinition in GetVariationCoefficientStochasts(true))
             {
                 yield return Tuple.Create(stochastDefinition.StochastName, stochastDefinition.Configuration);
@@ -219,10 +224,12 @@
                 {
                     throw new ArgumentNullException(nameof(stochastName));
                 }
+
                 if (getter == null)
                 {
                     throw new ArgumentNullException(nameof(getter));
                 }
+
                 if (setter == null)
                 {
                     throw new ArgumentNullException(nameof(setter));
@@ -283,10 +290,12 @@
                 {
                     throw new ArgumentNullException(nameof(stochastName));
                 }
+
                 if (getter == null)
                 {
                     throw new ArgumentNullException(nameof(getter));
                 }
+
                 if (setter == null)
                 {
                     throw new ArgumentNullException(nameof(setter));
Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ProfilesImporter.cs
===================================================================
diff -u -r61c2ac2573d82151b0b1593260a419543d07122a -ra8744fa1e115c1317d15a3f5784474aacaf2227d
--- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ProfilesImporter.cs	(.../ProfilesImporter.cs)	(revision 61c2ac2573d82151b0b1593260a419543d07122a)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ProfilesImporter.cs	(.../ProfilesImporter.cs)	(revision a8744fa1e115c1317d15a3f5784474aacaf2227d)
@@ -45,7 +45,6 @@
     /// <seealso cref="FileImporterBase{T}"/>
     public abstract class ProfilesImporter<T> : FileImporterBase<T>
     {
-        protected readonly IImporterMessageProvider MessageProvider;
         private readonly ReferenceLine referenceLine;
         private readonly string typeDescriptor;
 
@@ -68,10 +67,12 @@
             {
                 throw new ArgumentNullException(nameof(referenceLine));
             }
+
             if (messageProvider == null)
             {
                 throw new ArgumentNullException(nameof(messageProvider));
             }
+
             if (typeDescriptor == null)
             {
                 throw new ArgumentNullException(nameof(typeDescriptor));
@@ -82,6 +83,11 @@
             MessageProvider = messageProvider;
         }
 
+        /// <summary>
+        /// Gets the message provider to provide messages during the import.
+        /// </summary>
+        protected IImporterMessageProvider MessageProvider { get; }
+
         protected override bool OnImport()
         {
             ReadResult<ProfileLocation> importDikeProfilesResult = ReadProfileLocations();
@@ -148,6 +154,7 @@
                 case DamType.Vertical:
                     return new BreakWater(BreakWaterType.Wall, dikeProfileData.DamHeight);
             }
+
             return null;
         }
 
@@ -188,6 +195,7 @@
             {
                 Log.Error(exception.Message);
             }
+
             return new ReadResult<ProfileLocation>(true);
         }
 
@@ -223,6 +231,7 @@
                     return new ReadResult<ProfileLocation>(true);
                 }
             }
+
             return new ReadResult<ProfileLocation>(false)
             {
                 Items = profileLocations
@@ -252,11 +261,13 @@
             {
                 throw new LineParseException(string.Format(Resources.ProfilesImporter_AddNextProfileLocation_Location_with_id_0_outside_referenceline, profileLocation.Id));
             }
+
             if (profileLocations.Any(dpl => dpl.Id.Equals(profileLocation.Id)))
             {
                 string message = string.Format(Resources.ProfilesImporter_AddNextProfileLocation_Location_with_id_0_already_read, profileLocation.Id);
                 throw new CriticalFileReadException(message);
             }
+
             profileLocations.Add(profileLocation);
         }
 
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsLocationInputBaseProperties.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -ra8744fa1e115c1317d15a3f5784474aacaf2227d
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsLocationInputBaseProperties.cs	(.../MacroStabilityInwardsLocationInputBaseProperties.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsLocationInputBaseProperties.cs	(.../MacroStabilityInwardsLocationInputBaseProperties.cs)	(revision a8744fa1e115c1317d15a3f5784474aacaf2227d)
@@ -41,8 +41,6 @@
         private const int waterLevelPolderPropertyIndex = 1;
         private const int offsetsPropertyIndex = 2;
 
-        protected readonly IObservablePropertyChangeHandler PropertyChangeHandler;
-
         /// <summary>
         /// Creates a new instance of <see cref="MacroStabilityInwardsLocationInputBaseProperties{T}"/>.
         /// </summary>
@@ -55,10 +53,12 @@
             {
                 throw new ArgumentNullException(nameof(data));
             }
+
             if (handler == null)
             {
                 throw new ArgumentNullException(nameof(handler));
             }
+
             this.data = data;
             PropertyChangeHandler = handler;
         }
@@ -96,5 +96,10 @@
         {
             return string.Empty;
         }
+
+        /// <summary>
+        /// Gets the handler responsible for handling effects of a property change.
+        /// </summary>
+        protected IObservablePropertyChangeHandler PropertyChangeHandler { get; }
     }
 }
\ No newline at end of file