Cleanup indexing classes a little

Rename clazz to entityType
Rename newScrollableResults to scrollableResults
Remove redundant Class parameter