Use range loop instead of endless loop

Use range loop instead of endless loop #261