Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -r1e096895772e9946fe12cd79003d895e094b5d4b -r52bdea1c12a0bd8a3aee7673de0f9b328580f475
--- Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 1e096895772e9946fe12cd79003d895e094b5d4b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 52bdea1c12a0bd8a3aee7673de0f9b328580f475)
@@ -39,36 +39,45 @@
     /// <summary>
     /// Service that provides methods for performing Hydra-Ring calculations for marginal wave statistics.
     /// </summary>
-    public class WaveHeightCalculationService
+    internal static class WaveHeightCalculationService
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(WaveHeightCalculationService));
 
         /// <summary>
-        /// Performs validation over the values on the given <paramref name="hydraulicBoundaryDatabase"/>. Error information is logged during
+        /// Performs validation of the values in the given <paramref name="hydraulicBoundaryDatabase"/>. Error information is logged during
         /// the execution of the operation.
         /// </summary>
         /// <param name="hydraulicBoundaryDatabase">The <see cref="HydraulicBoundaryDatabase"/> for which to validate the values.</param>
         /// <param name="hydraulicBoundaryLocation">The <see cref="HydraulicBoundaryLocation"/> for which to validate the values.</param>
         /// <returns><c>False</c> if <paramref name="hydraulicBoundaryDatabase"/> contains validation errors; <c>True</c> otherwise.</returns>
         internal static bool Validate(HydraulicBoundaryDatabase hydraulicBoundaryDatabase, HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
-            var calculationName = string.Format(Resources.WaveHeightCalculationService_Name_Wave_height_for_location_0_,hydraulicBoundaryLocation.Name);
+            var calculationName = string.Format(Resources.WaveHeightCalculationService_Name_Wave_height_for_location_0_, hydraulicBoundaryLocation.Name);
             CalculationServiceHelper.LogValidationBeginTime(calculationName);
 
-            var validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabase.FilePath);
-            var hasErrors = string.IsNullOrEmpty(validationProblem);
+            string validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabase.FilePath);
+            var isValid = string.IsNullOrEmpty(validationProblem);
 
-            if (!hasErrors)
+            if (!isValid)
             {
                 CalculationServiceHelper.LogMessagesAsError(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_,
                                                             validationProblem);
             }
 
             CalculationServiceHelper.LogValidationEndTime(calculationName);
 
-            return hasErrors;
+            return isValid;
         }
 
+        /// <summary>
+        /// Performs a wave height calculation based on the supplied <see cref="HydraulicBoundaryLocation"/> and returns the result
+        /// if the calculation was successful. Error and status information is logged during the execution of the operation.
+        /// </summary>
+        /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> to base the input for the calculation upon.</param>
+        /// <param name="hydraulicBoundaryDatabase">The <see cref="HydraulicBoundaryDatabase"/> to base the input for the calculation upon.</param>
+        /// <param name="hydraulicBoundaryLocation">The <see cref="HydraulicBoundaryLocation"/> to perform the calculation for.</param>
+        /// <param name="ringId">The id of the ring to perform the calculation for.</param>
+        /// <returns>A <see cref="TargetProbabilityCalculationOutput"/> on a successful calculation, <c>null</c> otherwise.</returns>
         internal static TargetProbabilityCalculationOutput Calculate(IAssessmentSection assessmentSection, HydraulicBoundaryDatabase hydraulicBoundaryDatabase,
                                                                      HydraulicBoundaryLocation hydraulicBoundaryLocation, string ringId)
         {