yay refactor

Created by  Bowei Liu  on October 14, 2020
NQA6YRMRCF7LIHPYWLC355FPCH7CYA3QKSKQHSNJHA2XHOCWZXCAC
Change contents