Small refactoring in DataValueGenerator