some cleanup and index names changes