UPDATED tidying code

Merged Jean-Loup Haberbusch requested to merge Bug/noexceptwarningw7 into develop

Merge request reports