Revert "refactor"

This reverts commit 8f519d0cf23bde05d64cbe0d600db78ef29c84f5.