Revert "Refactor"

This reverts commit d2e14aacac9fc18dec424d9bae9a63a904732d91.