Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r84dcc2c2dfc224ad20285f74b6c7b20f5f49d2b2
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision e182f6f394aa75e739467a77e7bcacd9a8b25429)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 84dcc2c2dfc224ad20285f74b6c7b20f5f49d2b2)
@@ -22,7 +22,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Core.Common.Base.Data;
 using Core.Common.Utils;
 using log4net;
 using Ringtoets.Common.Data.Hydraulics;
@@ -102,14 +101,8 @@
 
                 if (string.IsNullOrEmpty(calculator.LastErrorFileContent))
                 {
-                    hydraulicBoundaryLocation.WaveHeight = (RoundedDouble) calculator.WaveHeight;
-                    hydraulicBoundaryLocation.WaveHeightCalculationConvergence =
-                        RingtoetsCommonDataCalculationService.CalculationConverged(calculator.ReliabilityIndex, norm);
-
-                    hydraulicBoundaryLocation.WaveHeightOutput = CreateHydraulicBoundaryLocationOutput(messageProvider,
-                                                                                                             hydraulicBoundaryLocation.Name,
-                                                                                                             calculationInput.Beta,
-                                                                                                             norm);
+                    hydraulicBoundaryLocation.WaveHeightOutput = CreateHydraulicBoundaryLocationOutput(
+                        messageProvider, hydraulicBoundaryLocation.Name, calculationInput.Beta, norm);
                 }
             }
             catch (HydraRingFileParserException)
@@ -161,9 +154,9 @@
                                                                                       double targetReliability,
                                                                                       double targetProbability)
         {
-            var designWaterLevel = calculator.WaveHeight;
-            var reliability = calculator.ReliabilityIndex;
-            var probability = StatisticsConverter.ReliabilityToProbability(reliability);
+            double designWaterLevel = calculator.WaveHeight;
+            double reliability = calculator.ReliabilityIndex;
+            double probability = StatisticsConverter.ReliabilityToProbability(reliability);
 
             CalculationConvergence converged = RingtoetsCommonDataCalculationService.CalculationConverged(
                 calculator.ReliabilityIndex, targetProbability);
@@ -173,16 +166,14 @@
                 log.Warn(messageProvider.GetCalculatedNotConvergedMessage(hydraulicBoundaryLocationName));
             }
 
-            return new HydraulicBoundaryLocationOutput(
-                designWaterLevel,
-                targetProbability,
-                targetReliability,
-                probability,
-                reliability,
-                converged);
+            return new HydraulicBoundaryLocationOutput(designWaterLevel, targetProbability,
+                                                       targetReliability, probability, reliability,
+                                                       converged);
         }
 
-        private WaveHeightCalculationInput CreateInput(HydraulicBoundaryLocation hydraulicBoundaryLocation, double norm, string hydraulicBoundaryDatabaseFilePath)
+        private static WaveHeightCalculationInput CreateInput(HydraulicBoundaryLocation hydraulicBoundaryLocation,
+                                                              double norm,
+                                                              string hydraulicBoundaryDatabaseFilePath)
         {
             var waveHeightCalculationInput = new WaveHeightCalculationInput(1, hydraulicBoundaryLocation.Id, norm);