Language clean-up by Dave.
language clean-up and merge Bharath's section
Liron's section