Minor cleanup and documentation of index