Hello,

This MR is a second pass of code cleaning, to make it more readable, before we can attempt anything.
It does not change the reconstruction output.

Cheers,
Bertrand