代码架构优化

Signed-off-by: zvenshy <zvenshy@gmail.com>