FIX Code cleaning

Merged Jean-Loup Haberbusch requested to merge code-cleaning into develop

Merge request reports