Smaller cleanups

Created by  AfoHT  on January 22, 2022
PHGHD34WAJPGGGEBBYROWAT3EMG6HGL53JRHL3CSXGK5TMKQXDQQC
Change contents