more clean up, focusing on index