Neatened index code again.

Even sexier to read now.