Fixing some comments and reformatting

Created by  pmeunier  on July 30, 2021
HCDD6FX7YL5MDK757ZE6MYHB2YHCUAO2Y3Y347JBTG4DNCIJJBIQC
Change contents