Cleanup, comments, renaming

Created by  pmeunier  on February 14, 2021
CCNPHVQCIGINWTLXCHOASGVWUPBZXFOLM2F7HTKMEA2DMFTOX7TAC
Change contents