Revert "Refactoring"

This reverts commit 5803940407dd01b0b073a51bf7f8444d868e2c61.