Revert "make some minor changes"

This reverts commit fd827455c700c0139e8b4633962bdd83f1644bc1.
Revert "sync the changes on the master"

This reverts commit 4310e3b3f1aed953b7ddd0e6b986b39ae1c5354b.