深入重构中

Signed-off-by: Meathill <meathill@gmail.com>