Minor cleanup to index