Some more clean up in datasplitter package.