--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthState.java	Mon Feb 26 18:10:03 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthState.java	Tue Feb 27 18:06:52 2018 +0100
@@ -78,15 +78,10 @@
      */
     private Object compute(final SINFOArtifact sinfo, final CallContext context, final String hash, final List<Facet> facets, final Object old) {
 
-        final CalculationResult res;
-        if (old instanceof CalculationResult)
-            res = (CalculationResult) old;
-        else
-            res = new FlowDepthCalculation(context).calculate(sinfo);
+        final CalculationResult res = doCompute(sinfo, context, old);
 
-        if (facets == null) {
+        if (facets == null)
             return res;
-        }
 
         final FlowDepthCalculationResults results = (FlowDepthCalculationResults) res.getData();
 
@@ -140,4 +135,11 @@
 
         return res;
     }
+
+    private CalculationResult doCompute(final SINFOArtifact sinfo, final CallContext context, final Object old) {
+        if (old instanceof CalculationResult)
+            return (CalculationResult) old;
+
+        return new FlowDepthCalculation(context).calculate(sinfo);
+    }
 }
\ No newline at end of file