Revert "some refactor and comments"

This reverts commit 5819d1a4912ba89106535c8fcde30d77aa01c9c2.