oof refactor

Created by  Bowei Liu  on December 23, 2020
3UFL673QX2JG7KHTAM7DFH4BBYVHDNMXBS2RW45G3JBNFZFLSRRQC
Change contents