Continue refactor

Created by  quickdudley  on May 15, 2022
NWVUHV6ZKCRTT3UEXCBWPSGX4CGWXGLK2QTDCUN4L2JKL56N2SNQC
Change contents