refactoring data generator ongoing