Refactor code

Refactor code
Modify

do some modify