Updated index formatting