index cleanup
more language cleanup