Revert "Refactoring"

This reverts commit 0f397098ae6698a4c94120de81f7aa0b0dab4caa.