Revert "refactor"

This reverts commit 4bf0f42cf5d6440f99a0420758d64058c7362da9.