Revert "refactoring"

This reverts commit 48904a3e769357f6384a4ced93bedd9f95a19095.