diff --git a/src/Web/DOM/XPath.js b/src/Web/DOM/XPath.js
index fbdb6d1..e80b2f9 100644
--- a/src/Web/DOM/XPath.js
+++ b/src/Web/DOM/XPath.js
@@ -1,6 +1,6 @@
 "use strict";
 
-exports.evaluateInternal = function (xpathExpression) {
+export function evaluateInternal(xpathExpression) {
   return function (contextNode) {
     return function (namespaceResolver) {
       return function (resultType) {
@@ -20,83 +20,82 @@ exports.evaluateInternal = function (xpathExpression) {
       };
     };
   };
-};
-
+}
 
 //       --- XPathResult functions ---
 
-exports.resultType = function (xpathResult) {
+export function resultType(xpathResult) {
   return xpathResult.resultType;
-};
+}
 
-exports.numberValue = function (xpathResult) {
+export function numberValue(xpathResult) {
   return function () { // Effect thunk
     return xpathResult.numberValue;
   };
-};
+}
 
-exports.stringValue = function (xpathResult) {
+export function stringValue(xpathResult) {
   return function () { // Effect thunk
     return xpathResult.stringValue;
   };
-};
+}
 
-exports.booleanValue = function (xpathResult) {
+export function booleanValue(xpathResult) {
   return function () { // Effect thunk
     return xpathResult.booleanValue;
   };
-};
+}
 
-exports.singleNodeValueInternal = function (xpathResult) {
+export function singleNodeValueInternal(xpathResult) {
   return function () { // Effect thunk
     return xpathResult.singleNodeValue;
   };
-};
+}
 
-exports.invalidIteratorState = function (xpathResult) {
+export function invalidIteratorState(xpathResult) {
   return xpathResult.invalidIteratorState;
-};
+}
 
-exports.snapshotLengthInternal = function (xpathResult) {
+export function snapshotLengthInternal(xpathResult) {
   return function () { // Effect thunk
     return xpathResult.snapshotLength;
   };
-};
+}
 
-exports.iterateNextInternal = function (xpathResult) {
+export function iterateNextInternal(xpathResult) {
   return function () { // Effect thunk
     return xpathResult.iterateNext();
   };
-};
+}
 
-exports.snapshotItemInternal = function (xpathResult) {
+export function snapshotItemInternal(xpathResult) {
   return function (index) {
     return function () { // Effect thunk
       return xpathResult.snapshotItem(index);
     };
   };
-};
+}
 
 //       --- namespace resolver functions ---
 
-exports.customNSResolver = function (customRes) {
+export function customNSResolver(customRes) {
   var nsResolver = {
     lookupNamespaceURI : customRes
   };
   return nsResolver;
-};
+}
 
-exports.createNSResolver = function (nodeResolver) {
+export function createNSResolver(nodeResolver) {
   return function (doc) {
     return doc.createNSResolver(nodeResolver);
   };
-};
+}
 
-exports.lookupNamespaceURIInternal = function (nsResolver) {
+export function lookupNamespaceURIInternal(nsResolver) {
   return function (prefix) {
     return nsResolver.lookupNamespaceURI(prefix);
   };
-};
+}
 
 // exports._makeEmptyDoc = function () {  // Effect thunk
 //     var doc = (new DOMParser()).parseFromString('<dummy/>', 'application/xml');
diff --git a/src/Web/DOM/XPath/ResultType.js b/src/Web/DOM/XPath/ResultType.js
index 11e7200..d58eca7 100644
--- a/src/Web/DOM/XPath/ResultType.js
+++ b/src/Web/DOM/XPath/ResultType.js
@@ -1,13 +1,13 @@
 "use strict";
 
-exports.any_type = XPathResult.ANY_TYPE;
-exports.number_type = XPathResult.NUMBER_TYPE;
-exports.string_type = XPathResult.STRING_TYPE;
-exports.boolean_type = XPathResult.BOOLEAN_TYPE;
-exports.unordered_node_iterator_type = XPathResult.UNORDERED_NODE_ITERATOR_TYPE;
-exports.ordered_node_iterator_type  = XPathResult.ORDERED_NODE_ITERATOR_TYPE;
-exports.unordered_node_snapshot_type = XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE;
-exports.ordered_node_snapshot_type = XPathResult.ORDERED_NODE_SNAPSHOT_TYPE;
-exports.any_unordered_node_type = XPathResult.ANY_UNORDERED_NODE_TYPE;
-exports.first_ordered_node_type = XPathResult.FIRST_ORDERED_NODE_TYPE;
+export const any_type = XPathResult.ANY_TYPE;
+export const number_type = XPathResult.NUMBER_TYPE;
+export const string_type = XPathResult.STRING_TYPE;
+export const boolean_type = XPathResult.BOOLEAN_TYPE;
+export const unordered_node_iterator_type = XPathResult.UNORDERED_NODE_ITERATOR_TYPE;
+export const ordered_node_iterator_type = XPathResult.ORDERED_NODE_ITERATOR_TYPE;
+export const unordered_node_snapshot_type = XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE;
+export const ordered_node_snapshot_type = XPathResult.ORDERED_NODE_SNAPSHOT_TYPE;
+export const any_unordered_node_type = XPathResult.ANY_UNORDERED_NODE_TYPE;
+export const first_ordered_node_type = XPathResult.FIRST_ORDERED_NODE_TYPE;
 
diff --git a/test/node.js b/test/node.js
index 3f8ba83..e2c67ff 100644
--- a/test/node.js
+++ b/test/node.js
@@ -1,4 +1,4 @@
-const { JSDOM } = require("jsdom");
+import {JSDOM} from "jsdom";
 const { XPathResult, DOMParser } = new JSDOM().window;
 
 Object.assign(global, { XPathResult, DOMParser })