Use new method to refactor code
Remove range_start and range_end