Revert "try to fix litle bug"

This reverts commit 825b96250eac0c615e0929cd224cca105d3d8e34.
Revert "try to fix a litle bug ..."

This reverts commit ee518835eb63f7f8f38af6006b30f392ea94dcc7.
Revert "Code refactoring"

This reverts commit ce821b8aa0f886d224b3a31b3bed876481d8ba7e.