Modularize and re-check tranformation of data