Refactoring a bit

Exploding the huge function compute_matrix(), so that it would be easier
to select whether to try to compute a better path for the trace or not
(anonymized vs non anonymized), then to make some tries on the
sanitazation process.
Merge remote-tracking branch 'origin/master'