simpler index names plus util comments