Refactor NumberRange