Revert "refactor 2"

This reverts commit 542ddca28f3d76656dc549c34871b4aff292084a.