refactor names and add comments

Created by  Bowei Liu  on December 24, 2020
27ELNQF5ACGIS3FZ5ITFD4D4NYMLZ2IJ4WDP7QVTMXLBBFIKICFAC
Change contents