Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs
===================================================================
diff -u -re69acb9595f7bf1d202ddd1fb51934b66768b75d -r9b92b0800fb589b1964b6e97e2d82a1765d3e6ad
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs	(.../HydraRingCalculatorFactory.cs)	(revision e69acb9595f7bf1d202ddd1fb51934b66768b75d)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs	(.../HydraRingCalculatorFactory.cs)	(revision 9b92b0800fb589b1964b6e97e2d82a1765d3e6ad)
@@ -19,8 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
-
 namespace Ringtoets.HydraRing.Calculation.Calculator.Factory
 {
     /// <summary>
@@ -38,11 +36,7 @@
         {
             get
             {
-                if (instance == null)
-                {
-                    instance = new HydraRingCalculatorFactory();
-                }
-                return instance;
+                return instance ?? (instance = new HydraRingCalculatorFactory());
             }
             internal set
             {
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs
===================================================================
diff -u -re69acb9595f7bf1d202ddd1fb51934b66768b75d -r9b92b0800fb589b1964b6e97e2d82a1765d3e6ad
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs	(.../HydraRingCalculatorBase.cs)	(revision e69acb9595f7bf1d202ddd1fb51934b66768b75d)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs	(.../HydraRingCalculatorBase.cs)	(revision 9b92b0800fb589b1964b6e97e2d82a1765d3e6ad)
@@ -79,7 +79,7 @@
         /// <summary>
         /// Gets the parsers that are executed on the output file(s) of Hydra-Ring.
         /// </summary>
-        /// <returns></returns>
+        /// <returns>The parsers to execute.</returns>
         protected virtual IEnumerable<IHydraRingFileParser> GetParsers()
         {
             yield break;
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDesignWaterLevelCalculator.cs
===================================================================
diff -u -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71 -r9b92b0800fb589b1964b6e97e2d82a1765d3e6ad
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDesignWaterLevelCalculator.cs	(.../IDesignWaterLevelCalculator.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDesignWaterLevelCalculator.cs	(.../IDesignWaterLevelCalculator.cs)	(revision 9b92b0800fb589b1964b6e97e2d82a1765d3e6ad)
@@ -38,13 +38,8 @@
         /// Gets the reliability index
         /// </summary>
         double ReliabilityIndex { get; }
-
+        
         /// <summary>
-        /// Gets the content of the output file generated during the Hydra-Ring calculation.
-        /// </summary>
-        string OutputFileContent { get; }
-
-        /// <summary>
         /// Performs the actual calculation by running the Hydra-Ring executable.
         /// </summary>
         /// <param name="input">The <see cref="AssessmentLevelCalculationInput"/> which contains all the necessary input
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresOvertoppingCalculator.cs
===================================================================
diff -u -rb2306061789f5e34a6f0994552b4431d01d220f0 -r9b92b0800fb589b1964b6e97e2d82a1765d3e6ad
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresOvertoppingCalculator.cs	(.../IStructuresOvertoppingCalculator.cs)	(revision b2306061789f5e34a6f0994552b4431d01d220f0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresOvertoppingCalculator.cs	(.../IStructuresOvertoppingCalculator.cs)	(revision 9b92b0800fb589b1964b6e97e2d82a1765d3e6ad)
@@ -23,6 +23,10 @@
 
 namespace Ringtoets.HydraRing.Calculation.Calculator
 {
+    /// <summary>
+    /// Interface for a calculator for calculating probability of failure by overtopping or overflow and the
+    /// associated wave height. This is used in a height structures assessment.
+    /// </summary>
     public interface IStructuresOvertoppingCalculator
     {
         /// <summary>
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveConditionsCosineCalculator.cs
===================================================================
diff -u -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71 -r9b92b0800fb589b1964b6e97e2d82a1765d3e6ad
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveConditionsCosineCalculator.cs	(.../IWaveConditionsCosineCalculator.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveConditionsCosineCalculator.cs	(.../IWaveConditionsCosineCalculator.cs)	(revision 9b92b0800fb589b1964b6e97e2d82a1765d3e6ad)
@@ -27,8 +27,8 @@
     /// Interface for a calculator which calculates values for a wave at a water level.
     /// These are used in different failure mechanisms as input.
     /// </summary>
-    public interface IWaveConditionsCosineCalculator {
-
+    public interface IWaveConditionsCosineCalculator
+    {
         /// <summary>
         /// Gets the height of the wave.
         /// </summary>
@@ -43,13 +43,8 @@
         /// Gets the peak period of the wave.
         /// </summary>
         double WavePeakPeriod { get; }
-
+        
         /// <summary>
-        /// Gets the content of the output file generated during the Hydra-Ring calculation.
-        /// </summary>
-        string OutputFileContent { get; }
-
-        /// <summary>
         /// Performs the actual calculation by running the Hydra-Ring executable.
         /// </summary>
         /// <param name="input">The <see cref="WaveConditionsCosineCalculationInput"/> which contains all the necessary input
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveHeightCalculator.cs
===================================================================
diff -u -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71 -r9b92b0800fb589b1964b6e97e2d82a1765d3e6ad
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveHeightCalculator.cs	(.../IWaveHeightCalculator.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveHeightCalculator.cs	(.../IWaveHeightCalculator.cs)	(revision 9b92b0800fb589b1964b6e97e2d82a1765d3e6ad)
@@ -38,13 +38,8 @@
         /// The reliability index towards which was iterated.
         /// </summary>
         double ReliabilityIndex { get; }
-
+        
         /// <summary>
-        /// Gets the content of the output file generated during the Hydra-Ring calculation.
-        /// </summary>
-        string OutputFileContent { get; }
-
-        /// <summary>
         /// Performs the actual calculation by running the Hydra-Ring executable.
         /// </summary>
         /// <param name="input">The <see cref="WaveHeightCalculationInput"/> which contains all the necessary input
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/StructuresOvertoppingCalculator.cs
===================================================================
diff -u -re69acb9595f7bf1d202ddd1fb51934b66768b75d -r9b92b0800fb589b1964b6e97e2d82a1765d3e6ad
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/StructuresOvertoppingCalculator.cs	(.../StructuresOvertoppingCalculator.cs)	(revision e69acb9595f7bf1d202ddd1fb51934b66768b75d)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/StructuresOvertoppingCalculator.cs	(.../StructuresOvertoppingCalculator.cs)	(revision 9b92b0800fb589b1964b6e97e2d82a1765d3e6ad)
@@ -27,6 +27,10 @@
 
 namespace Ringtoets.HydraRing.Calculation.Calculator
 {
+    /// <summary>
+    /// Calculator for calculating probability of failure by overtopping or overflow and the
+    /// associated wave height. This is used in a height structures assessment.
+    /// </summary>
     internal class StructuresOvertoppingCalculator : HydraRingCalculatorBase, IStructuresOvertoppingCalculator
     {
         private readonly ExceedanceProbabilityCalculationParser exceedanceProbabilityCalculationParser;
@@ -45,7 +49,7 @@
             ExceedanceProbabilityBeta = double.NaN;
         }
 
-        public double ExceedanceProbabilityBeta { get; set; }
+        public double ExceedanceProbabilityBeta { get; private set; }
 
         public void Calculate(StructuresOvertoppingCalculationInput input)
         {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs
===================================================================
diff -u -rb646e027b7b030947d7339c442d44810d9347893 -r9b92b0800fb589b1964b6e97e2d82a1765d3e6ad
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs	(.../HydraRingCalculatorBaseTest.cs)	(revision b646e027b7b030947d7339c442d44810d9347893)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs	(.../HydraRingCalculatorBaseTest.cs)	(revision 9b92b0800fb589b1964b6e97e2d82a1765d3e6ad)
@@ -77,7 +77,7 @@
             parser = new TestParser();
         }
 
-        public bool Output { get; set; }
+        public bool Output { get; private set; }
 
         public void PublicCalculate()
         {
@@ -136,7 +136,7 @@
 
     internal class TestParser : IHydraRingFileParser
     {
-        public bool Parsed { get; set; }
+        public bool Parsed { get; private set; }
 
         public void Parse(string workingDirectory, int sectionId)
         {