Improve formatting of indexes