Fix index and format