Code re-arrangement and re-factoring wrt discussion with data-ops