Revert "some refactor"

This reverts commit 3d18358e129e3a464f236182b9640bf49a451f9d.