range_cycle refactoring