Improve Xml comments