Simplify xpaths and comments