Revert "refactoring"

This reverts commit 885e2f744d1a277d8ff3f05a1d500932106427ad.