Revert "refactor"

This reverts commit 62e4932e90f8500a8c0b0e61575e2b543fe8ac24.