重构

Signed-off-by: Shindo Wu <cn.shindo@gmail.com>