Revert "Refactore 02"

This reverts commit 4688da22d3fd5b4ec84cf983915a798fda15a44c.