Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/SerializableAssemblyCreator.cs
===================================================================
diff -u -rf15c162a884bbe14b080bc91202e6d791a9e784a -ra7cf16c0755fc4db5eb96548b5ee9ebbe075ac33
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/SerializableAssemblyCreator.cs	(.../SerializableAssemblyCreator.cs)	(revision f15c162a884bbe14b080bc91202e6d791a9e784a)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/SerializableAssemblyCreator.cs	(.../SerializableAssemblyCreator.cs)	(revision a7cf16c0755fc4db5eb96548b5ee9ebbe075ac33)
@@ -71,51 +71,29 @@
                                                                                                                       .ToArray();
 
             AggregatedSerializableCombinedFailureMechanismSectionAssemblies aggregatedSerializableCombinedFailureMechanismSectionAssemblies =
-                AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreator.Create(idGenerator, serializableTotalAssemblyResult, assessmentSection.CombinedSectionAssemblyResults);
+                AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreator.Create(idGenerator, 
+                                                                                              serializableTotalAssemblyResult,
+                                                                                              assessmentSection.CombinedSectionAssemblyResults);
 
-            var serializableFailureMechanisms = new List<SerializableFailureMechanism>();
-            serializableFailureMechanisms.AddRange(aggregatedFailureMechanismsWithProbability.Select(afm => afm.FailureMechanism));
-            serializableFailureMechanisms.AddRange(aggregatedFailureMechanismsWithoutProbability.Select(afm => afm.FailureMechanism));
-
-            var serializableFailureMechanismSectionCollection = new List<SerializableFailureMechanismSectionCollection>();
-            serializableFailureMechanismSectionCollection.AddRange(aggregatedFailureMechanismsWithProbability.Select(afm => afm.FailureMechanismSectionCollection));
-            serializableFailureMechanismSectionCollection.AddRange(aggregatedFailureMechanismsWithoutProbability.Select(afm => afm.FailureMechanismSectionCollection));
-            serializableFailureMechanismSectionCollection.Add(aggregatedSerializableCombinedFailureMechanismSectionAssemblies.FailureMechanismSectionCollection);
-
-            var serializableFailureMechanismSections = new List<SerializableFailureMechanismSection>();
-            serializableFailureMechanismSections.AddRange(aggregatedFailureMechanismsWithProbability.SelectMany(afm => afm.FailureMechanismSections));
-            serializableFailureMechanismSections.AddRange(aggregatedFailureMechanismsWithoutProbability.SelectMany(afm => afm.FailureMechanismSections));
-            serializableFailureMechanismSections.AddRange(aggregatedSerializableCombinedFailureMechanismSectionAssemblies.FailureMechanismSections);
-
-            var serializableFailureMechanismSectionAssemblies = new List<SerializableFailureMechanismSectionAssembly>();
-            serializableFailureMechanismSectionAssemblies.AddRange(aggregatedFailureMechanismsWithProbability.SelectMany(afm => afm.FailureMechanismSectionAssemblyResults));
-            serializableFailureMechanismSectionAssemblies.AddRange(aggregatedFailureMechanismsWithoutProbability.SelectMany(afm => afm.FailureMechanismSectionAssemblyResults));
-
             return new SerializableAssembly(serializableAssemblyId,
                                             GetLowerCorner(assessmentSection.Geometry),
                                             GetUpperCorner(assessmentSection.Geometry),
                                             serializableAssessmentSection,
                                             serializableAssessmentProcess,
                                             serializableTotalAssemblyResult,
-                                            serializableFailureMechanisms,
-                                            serializableFailureMechanismSectionAssemblies,
+                                            GetAllSerializableFailureMechanisms(aggregatedFailureMechanismsWithProbability,
+                                                                                aggregatedFailureMechanismsWithoutProbability),
+                                            GetAllSerializableFailureMechanismSectionAssemblies(aggregatedFailureMechanismsWithProbability,
+                                                                                                aggregatedFailureMechanismsWithoutProbability),
                                             aggregatedSerializableCombinedFailureMechanismSectionAssemblies.CombinedFailureMechanismSectionAssemblies,
-                                            serializableFailureMechanismSectionCollection,
-                                            serializableFailureMechanismSections);
+                                            GetAllSerializableFailureMechanismSectionCollections(aggregatedFailureMechanismsWithProbability,
+                                                                                                 aggregatedFailureMechanismsWithoutProbability,
+                                                                                                 aggregatedSerializableCombinedFailureMechanismSectionAssemblies),
+                                            GetAllSerializableFailureMechanismSections(aggregatedFailureMechanismsWithProbability,
+                                                                                       aggregatedFailureMechanismsWithoutProbability, 
+                                                                                       aggregatedSerializableCombinedFailureMechanismSectionAssemblies));
         }
 
-        private static Point2D GetLowerCorner(IEnumerable<Point2D> geometry)
-        {
-            return new Point2D(geometry.Select(p => p.X).Min(),
-                               geometry.Select(p => p.Y).Min());
-        }
-
-        private static Point2D GetUpperCorner(IEnumerable<Point2D> geometry)
-        {
-            return new Point2D(geometry.Select(p => p.X).Max(),
-                               geometry.Select(p => p.Y).Max());
-        }
-
         private static AggregatedSerializableFailureMechanism CreateFailureMechanismsWithProbability(UniqueIdentifierGenerator idGenerator,
                                                                                                      SerializableTotalAssemblyResult serializableTotalAssemblyResult,
                                                                                                      ExportableFailureMechanism<ExportableFailureMechanismAssemblyResultWithProbability> failureMechanism)
@@ -129,5 +107,61 @@
         {
             return AggregatedSerializableFailureMechanismCreator.Create(idGenerator, serializableTotalAssemblyResult, failureMechanism);
         }
+
+        private static IEnumerable<SerializableFailureMechanismSectionAssembly> GetAllSerializableFailureMechanismSectionAssemblies(
+            IEnumerable<AggregatedSerializableFailureMechanism> aggregatedFailureMechanismsWithProbability,
+            IEnumerable<AggregatedSerializableFailureMechanism> aggregatedFailureMechanismsWithoutProbability)
+        {
+            var serializableFailureMechanismSectionAssemblies = new List<SerializableFailureMechanismSectionAssembly>();
+            serializableFailureMechanismSectionAssemblies.AddRange(aggregatedFailureMechanismsWithProbability.SelectMany(afm => afm.FailureMechanismSectionAssemblyResults));
+            serializableFailureMechanismSectionAssemblies.AddRange(aggregatedFailureMechanismsWithoutProbability.SelectMany(afm => afm.FailureMechanismSectionAssemblyResults));
+            return serializableFailureMechanismSectionAssemblies;
+        }
+
+        private static IEnumerable<SerializableFailureMechanismSection> GetAllSerializableFailureMechanismSections(
+            IEnumerable<AggregatedSerializableFailureMechanism> aggregatedFailureMechanismsWithProbability,
+            IEnumerable<AggregatedSerializableFailureMechanism> aggregatedFailureMechanismsWithoutProbability,
+            AggregatedSerializableCombinedFailureMechanismSectionAssemblies aggregatedSerializableCombinedFailureMechanismSectionAssemblies)
+        {
+            var serializableFailureMechanismSections = new List<SerializableFailureMechanismSection>();
+            serializableFailureMechanismSections.AddRange(aggregatedFailureMechanismsWithProbability.SelectMany(afm => afm.FailureMechanismSections));
+            serializableFailureMechanismSections.AddRange(aggregatedFailureMechanismsWithoutProbability.SelectMany(afm => afm.FailureMechanismSections));
+            serializableFailureMechanismSections.AddRange(aggregatedSerializableCombinedFailureMechanismSectionAssemblies.FailureMechanismSections);
+            return serializableFailureMechanismSections;
+        }
+
+        private static IEnumerable<SerializableFailureMechanismSectionCollection> GetAllSerializableFailureMechanismSectionCollections(
+            IEnumerable<AggregatedSerializableFailureMechanism> aggregatedFailureMechanismsWithProbability,
+            IEnumerable<AggregatedSerializableFailureMechanism> aggregatedFailureMechanismsWithoutProbability,
+            AggregatedSerializableCombinedFailureMechanismSectionAssemblies aggregatedSerializableCombinedFailureMechanismSectionAssemblies)
+        {
+            var serializableFailureMechanismSectionCollection = new List<SerializableFailureMechanismSectionCollection>();
+            serializableFailureMechanismSectionCollection.AddRange(aggregatedFailureMechanismsWithProbability.Select(afm => afm.FailureMechanismSectionCollection));
+            serializableFailureMechanismSectionCollection.AddRange(aggregatedFailureMechanismsWithoutProbability.Select(afm => afm.FailureMechanismSectionCollection));
+            serializableFailureMechanismSectionCollection.Add(aggregatedSerializableCombinedFailureMechanismSectionAssemblies.FailureMechanismSectionCollection);
+            return serializableFailureMechanismSectionCollection;
+        }
+
+        private static IEnumerable<SerializableFailureMechanism> GetAllSerializableFailureMechanisms(
+            IEnumerable<AggregatedSerializableFailureMechanism> aggregatedFailureMechanismsWithProbability,
+            IEnumerable<AggregatedSerializableFailureMechanism> aggregatedFailureMechanismsWithoutProbability)
+        {
+            var serializableFailureMechanisms = new List<SerializableFailureMechanism>();
+            serializableFailureMechanisms.AddRange(aggregatedFailureMechanismsWithProbability.Select(afm => afm.FailureMechanism));
+            serializableFailureMechanisms.AddRange(aggregatedFailureMechanismsWithoutProbability.Select(afm => afm.FailureMechanism));
+            return serializableFailureMechanisms;
+        }
+
+        private static Point2D GetLowerCorner(IEnumerable<Point2D> geometry)
+        {
+            return new Point2D(geometry.Select(p => p.X).Min(),
+                               geometry.Select(p => p.Y).Min());
+        }
+
+        private static Point2D GetUpperCorner(IEnumerable<Point2D> geometry)
+        {
+            return new Point2D(geometry.Select(p => p.X).Max(),
+                               geometry.Select(p => p.Y).Max());
+        }
     }
 }
\ No newline at end of file