* less indexing

* removed unneeded clone

Co-authored-by: Keith Yeung <[email protected]>