[MOD] Some code cleaning and cosmetic changes

Merged Gabriel Davini requested to merge 8.0-stage into 8.0-preprod

Merge request reports