Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs
===================================================================
diff -u -raa55fdb26ada8d52049dff0afbacdad3d3b27d79 -r7d0d71ec5b07218cdd12fb5f77af2c56ff7b657b
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs	(.../AssessmentSectionView.cs)	(revision aa55fdb26ada8d52049dff0afbacdad3d3b27d79)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs	(.../AssessmentSectionView.cs)	(revision 7d0d71ec5b07218cdd12fb5f77af2c56ff7b657b)
@@ -65,27 +65,12 @@
             {
                 Observable = assessmentSection
             };
-            waterLevelCalculationsForFactorizedSignalingNormObserver = new RecursiveObserver<IObservableEnumerable<HydraulicBoundaryLocationCalculation>, HydraulicBoundaryLocationCalculation>(
-                UpdateMapData, calc => calc)
-            {
-                Observable = assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm
-            };
-            waterLevelCalculationsForSignalingNormObserver = new RecursiveObserver<IObservableEnumerable<HydraulicBoundaryLocationCalculation>, HydraulicBoundaryLocationCalculation>(
-                UpdateMapData, calc => calc)
-            {
-                Observable = assessmentSection.WaterLevelCalculationsForSignalingNorm
-            };
-            waterLevelCalculationsForLowerLimitNormObserver = new RecursiveObserver<IObservableEnumerable<HydraulicBoundaryLocationCalculation>, HydraulicBoundaryLocationCalculation>(
-                UpdateMapData, calc => calc)
-            {
-                Observable = assessmentSection.WaterLevelCalculationsForLowerLimitNorm
-            };
-            waterLevelCalculationsForFactorizedLowerLimitNormObserver = new RecursiveObserver<IObservableEnumerable<HydraulicBoundaryLocationCalculation>, HydraulicBoundaryLocationCalculation>(
-                UpdateMapData, calc => calc)
-            {
-                Observable = assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm
-            };
 
+            waterLevelCalculationsForFactorizedSignalingNormObserver = CreateHydraulicBoundaryLocationCalculationsObserver(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm);
+            waterLevelCalculationsForSignalingNormObserver = CreateHydraulicBoundaryLocationCalculationsObserver(assessmentSection.WaterLevelCalculationsForSignalingNorm);
+            waterLevelCalculationsForLowerLimitNormObserver = CreateHydraulicBoundaryLocationCalculationsObserver(assessmentSection.WaterLevelCalculationsForLowerLimitNorm);
+            waterLevelCalculationsForFactorizedLowerLimitNormObserver = CreateHydraulicBoundaryLocationCalculationsObserver(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm);
+
             hydraulicBoundaryLocationsObserver = new Observer(UpdateMapData)
             {
                 Observable = assessmentSection.HydraulicBoundaryDatabase.Locations
@@ -109,6 +94,16 @@
             ringtoetsMapControl.SetAllData(mapDataCollection, assessmentSection.BackgroundData);
         }
 
+        private RecursiveObserver<IObservableEnumerable<HydraulicBoundaryLocationCalculation>, HydraulicBoundaryLocationCalculation> CreateHydraulicBoundaryLocationCalculationsObserver(
+            IObservableEnumerable<HydraulicBoundaryLocationCalculation> calculations)
+        {
+            return new RecursiveObserver<IObservableEnumerable<HydraulicBoundaryLocationCalculation>, HydraulicBoundaryLocationCalculation>(
+                UpdateMapData, calc => calc)
+            {
+                Observable = calculations
+            };
+        }
+
         public object Data { get; set; }
 
         public IMapControl Map