Revert "refactoring"

This reverts commit c9323504246eb868f8ae83258e96f8248aaa16a2.