Revert "refactor"

This reverts commit 671f12df902caaef1b93bbcec67af25bd41437af.