* Refine and clean code
* Fix conflicts
Co-authored-by: NKaipeng Deng <dengkaipeng@baidu.com>