继续重构

Signed-off-by: MagicHu <huweimin@cn.ibm.com>