done xpath refactoring