Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs
===================================================================
diff -u -r7eb22f46c5d3e37a35bc8715d9369804e4957b35 -r50c61b470cd71b77a24ec39d7990ccf548109dd2
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs	(.../StabilityStoneCoverWaveConditionsCalculationService.cs)	(revision 7eb22f46c5d3e37a35bc8715d9369804e4957b35)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs	(.../StabilityStoneCoverWaveConditionsCalculationService.cs)	(revision 50c61b470cd71b77a24ec39d7990ccf548109dd2)
@@ -97,7 +97,6 @@
             RoundedDouble assessmentLevel = assessmentSection.GetAssessmentLevel(calculation.InputParameters.HydraulicBoundaryLocation,
                                                                                  calculation.InputParameters.CategoryType);
 
-            
             int waterLevelCount = calculation.InputParameters.GetWaterLevels(assessmentLevel).Count();
             TotalWaterLevelCalculations = calculationType == StabilityStoneCoverWaveConditionsCalculationType.Both
                                               ? waterLevelCount * 2
@@ -130,7 +129,7 @@
 
                 if (!Canceled)
                 {
-                    CreateOutput(calculation, blocksOutputs, columnsOutputs);
+                    calculation.Output = CreateOutput(calculationType, blocksOutputs, columnsOutputs);
                 }
             }
             finally
@@ -139,27 +138,21 @@
             }
         }
 
-        private static void CreateOutput(StabilityStoneCoverWaveConditionsCalculation calculation,
-                                         IEnumerable<WaveConditionsOutput> blocksOutputs,
-                                         IEnumerable<WaveConditionsOutput> columnsOutputs)
+        private static StabilityStoneCoverWaveConditionsOutput CreateOutput(StabilityStoneCoverWaveConditionsCalculationType calculationType,
+                                                                            IEnumerable<WaveConditionsOutput> blocksOutputs,
+                                                                            IEnumerable<WaveConditionsOutput> columnsOutputs)
         {
-            StabilityStoneCoverWaveConditionsCalculationType calculationType = calculation.InputParameters.CalculationType;
-            StabilityStoneCoverWaveConditionsOutput output;
-
             if (calculationType == StabilityStoneCoverWaveConditionsCalculationType.Blocks)
             {
-                output = StabilityStoneCoverWaveConditionsOutputFactory.CreateOutputWithBlocks(blocksOutputs);
+                return StabilityStoneCoverWaveConditionsOutputFactory.CreateOutputWithBlocks(blocksOutputs);
             }
-            else if (calculationType == StabilityStoneCoverWaveConditionsCalculationType.Columns)
+
+            if (calculationType == StabilityStoneCoverWaveConditionsCalculationType.Columns)
             {
-                output = StabilityStoneCoverWaveConditionsOutputFactory.CreateOutputWithColumns(columnsOutputs);
+                return StabilityStoneCoverWaveConditionsOutputFactory.CreateOutputWithColumns(columnsOutputs);
             }
-            else
-            {
-                output = StabilityStoneCoverWaveConditionsOutputFactory.CreateOutputWithColumnsAndBlocks(columnsOutputs, blocksOutputs);
-            }
 
-            calculation.Output = output;
+            return StabilityStoneCoverWaveConditionsOutputFactory.CreateOutputWithColumnsAndBlocks(columnsOutputs, blocksOutputs);
         }
 
         /// <summary>
@@ -171,7 +164,7 @@
         {
             if (!Enum.IsDefined(typeof(StabilityStoneCoverWaveConditionsCalculationType), calculationType))
             {
-                throw new InvalidEnumArgumentException(nameof(calculationType), (int)calculationType,
+                throw new InvalidEnumArgumentException(nameof(calculationType), (int) calculationType,
                                                        typeof(StabilityStoneCoverWaveConditionsCalculationType));
             }