Improved xml comments