refactor some boilerplate

Created by  Bowei Liu  on December 27, 2020
PZOXTKMY2XASMYOY4VIGP3IEBPO55A4RU4FBZDVRRNTQA32F25ZQC
Change contents