- use XPath provided by standard Java libraries - don't use HTML cleaner xpath
- some other cleanups