Revert "Refactoring"

This reverts commit e6e782510a426b6f20b2e4adb2f34c31bec3463b.