index: Make minor cleanup