Refactor

Alpha 1.2.0 代码重构