Add indexing for name & cleanup