Some cleanup on index.