reduce xpath export surface
Improve comments in xpath