Revert "Refactor"

This reverts commit 3a3456cca42b412144a00f2a37a8046be0fb4c71.