Index formatting tweaks