Updates #237 - Review XML comments

Simplifications made - more to come