junior dataload refactoring