Refactor 2 -> cleaning code

Signed-off-by: kim.shen <sjw_job@126.com>