xpath refactoring