FIX Code cleanning

Merged Jean-Loup Haberbusch requested to merge fix-cleanup-code into develop

a little cleaning in the code.

Merge request reports