refactor code
Revert "refactor code"

This reverts commit 89acd04dda5f92d3e0c4b5bb95e7f72047aa434c.