[liuxia] Refactor