Cleanup + comments

Created by  pmeunier  on February 11, 2021
73Z2UB3JGRLFNFORE7D64O4IHIFSZASD4G4FLJ4FJLHANT75MGIAC
Change contents