diff --git a/moringa.py b/moringa.py
index 7dbba599008c1953217df9a0153bccf5da95266b..67ec90c6cb9ca09592c57a0ea7378183255c4bd3 100755
--- a/moringa.py
+++ b/moringa.py
@@ -29,8 +29,7 @@ def preprocess_spot67(in_fld, out_fld, dem_fld, geoid_file, skip_ps, compress,
         sp.pansharp()
     if align_to is not None and os.path.exists(align_to):
         sp.rigid_align(align_to, this_band=align_using_band-1, ref_band=align_to_band-1)
-    sp.write_outputs(out_fld, compress=compress)
-    return
+    return sp.write_outputs(out_fld, compress=compress)
 
 def preprocess_s2(in_fld, out_fld, output_dates_file=None, roi=None,
                   align_to=None, align_to_band=3, align_using_band=3, provider='theia'):
@@ -54,9 +53,8 @@ def preprocess_s2(in_fld, out_fld, output_dates_file=None, roi=None,
     if (align_to == 'self'):
         align_to = None
 
-    s2.extract_feature_set(out_fld, store_gapfill=True, mosaicking='vrt', align=align,
+    return s2.extract_feature_set(out_fld, store_gapfill=True, mosaicking='vrt', align=align,
                            align_to=align_to, align_to_band=align_to_band, align_using_band=align_using_band)
-    return
 
 def preprocess_s1(in_fld, roi, out_fld, dem_fld=None, geoid=None, direction=None, satellite=None,
                   skip_despeckle=False, provider='native'):
@@ -77,8 +75,7 @@ def preprocess_s1(in_fld, roi, out_fld, dem_fld=None, geoid=None, direction=None
     if not skip_despeckle:
         s1.multitemp_speckle_filter()
     s1.compute_features()
-    s1.write_outputs(out_fld)
-    return
+    return s1.write_outputs(out_fld)
 
 def fetch(imagery, shp, dt, out_fld, auth):
     assert(imagery in ['s2theia', 's2planetary', 's1grd', 's1rtc', 'planetmosaics'])