Fixed index, cleaned formatting etc