Cleans up index ranges per #124