[enh] Splitting code