Simple refactor and continue

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