Cleanup and formatting

Created by  pmeunier  on September 9, 2021
KJOOI346EYXQIRDEGWHYILGX44AZNPHBFUDW5HYEEG5IC2ZXV6GAC
Change contents