Refactoring
Revert "Refactoring"

This reverts commit f9c653a9a6d0b355c8909171e96c05e1ae1524f6.
Refactoring