Changing some opaque phrasing to make it more readable.
More clarifying language.
End of 2.1 changes