[enh] Refactor