Revert "refactoring"

This reverts commit 9b110916f46f98c1c16ce9f6d793f479cfd58853.