cleaning up indexing