Fix sample
Cleanup xml-doc