Code refactoring
Code refactoring
Revert "Code refactoring"

This reverts commit 3701753df5c7c3211b1d336c9a5fea37af6f7dd7.