small fix
Revert "small fix"

This reverts commit cd73acacc99b530bce915da2a7fea07b6ebad450.
Revert "Code Enhancement"

This reverts commit 4f7105b6337c6665eada8a608242276c6d479ad0.