#368 Apply suggestions

74 jobs for 368-2-cif2dmm in 0 seconds (queued for 43 seconds)