[experiment] code re-factoring.