Revert "Refactored"

This reverts commit f0b41b32fdb25fbc03990b73990505384c582026.
Refactored