yay refactor

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