[enh] modularize
[test] experiment