This cleanup permits a better lisibility (and so usability) of
debug string over the code.
This is not exhaustive, just for the related issue needs.

Issue: #79075
Change-Id: I8885f6d46b6edb454a2d15305ba48d7e9bdf6d42