Revert "refactor"

This reverts commit 08b864eed17bfa17647bdf77a0e115920dfad507.