Refactor TupleRange