Revert "Refactoring"

This reverts commit 3ce3a263e3b0d642eec63b66f3d36b17752edc8c.