index random and clean up and rename