diff --git a/README.md b/README.md
index 612fcfc..9cbbf07 100644
--- a/README.md
+++ b/README.md
@@ -28,8 +28,8 @@ cd my-env
 . bin/activate
 git clone https://github.com/geopython/pygeometa.git
 cd pygeometa
-python setup.py build
-python setup.py install
+python3 setup.py build
+python3 setup.py install
 ```
 
 ## Running
@@ -113,7 +113,7 @@ Same as installing a package.  Use a virtualenv.  Also install developer
 requirements:
 
 ```bash
-pip install -r requirements-dev.txt
+pip3 install -r requirements-dev.txt
 ```
 
 ### Adding a Metadata Schema to the Core
@@ -156,10 +156,10 @@ vi pygeometa/schemas/foo/__init__.py
 
 ```bash
 # via setuptools
-python setup.py test
+python3 setup.py test
 # manually
 cd tests
-python run_tests.py
+python3 run_tests.py
 ```
 
 ## Releasing
@@ -175,7 +175,7 @@ git tag -a x.y.z -m 'tagging release x.y.z'
 # push tag
 git push --tags
 rm -fr build dist *.egg-info
-python setup.py sdist bdist_wheel --universal
+python3 setup.py sdist bdist_wheel --universal
 twine upload dist/*
 ```
 
diff --git a/docs/README.md b/docs/README.md
index 29aa0a4..478fc76 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -13,7 +13,7 @@ cd pygeometa
 # download pygeometa from GitHub
 git clone https://github.com/geopython/pygeometa.git
 # install required dependencies
-pip install -r requirements-dev.txt
+pip3 install -r requirements-dev.txt
 cd pygeometa/doc
 # build the website
 mkdocs build
diff --git a/docs/content/tutorial.md b/docs/content/tutorial.md
index f0f8790..6110c1f 100644
--- a/docs/content/tutorial.md
+++ b/docs/content/tutorial.md
@@ -14,7 +14,7 @@ You require Python 3 or greater to use pygeometa.
 The easiest way to install pygeometa is using pip:
 
 ```bash
-pip install pygeometa
+pip3 install pygeometa
 ```
 
 This will install the latest stable release.  If you are looking to work with
@@ -90,8 +90,8 @@ cd my-env
 . bin/activate
 git clone https://github.com/geopython/pygeometa.git
 cd pygeometa
-python setup.py build
-python setup.py install
+python3 setup.py build
+python3 setup.py install
 ```
 
 ### Using the API from Python
@@ -127,7 +127,7 @@ Same as installing a package.  Use a virtualenv.  Also install developer
 requirements:
 
 ```bash
-pip install -r requirements-dev.txt
+pip3 install -r requirements-dev.txt
 ```
 
 ### Adding a Metadata Schema to the Core
@@ -171,16 +171,16 @@ vi pygeometa/schemas/foo/__init__.py
 
 ```bash
 # via distutils
-python setup.py test
+python3 setup.py test
 # manually
 cd tests
-python run_tests.py
+python3 run_tests.py
 ```
 
 ## Releasing
 
 ```bash
-python setup.py sdist bdist_wheel --universal
+python3 setup.py sdist bdist_wheel --universal
 twine upload dist/*
 ```
 
diff --git a/pygeometa/schemas/iso19139/main.j2 b/pygeometa/schemas/iso19139/main.j2
index da48124..efc8ecd 100644
--- a/pygeometa/schemas/iso19139/main.j2
+++ b/pygeometa/schemas/iso19139/main.j2
@@ -397,8 +397,7 @@
       {% endif %}
       <gmd:transferOptions>
         <gmd:MD_DigitalTransferOptions>
-        {% set formats = prune_transfer_option(record['distribution'], record['identification']['language']) %}
-        {% for v in formats %}
+        {% for v in record['distribution'].values() %}
           <gmd:onLine>
             <gmd:CI_OnlineResource>
               <gmd:linkage>
diff --git a/pygeometa/schemas/iso19139_2/main.j2 b/pygeometa/schemas/iso19139_2/main.j2
index 0140125..a897e41 100644
--- a/pygeometa/schemas/iso19139_2/main.j2
+++ b/pygeometa/schemas/iso19139_2/main.j2
@@ -397,8 +397,7 @@
       {% endif %}
       <gmd:transferOptions>
         <gmd:MD_DigitalTransferOptions>
-        {% set formats = prune_transfer_option(record['distribution'], record['identification']['language']) %}
-        {% for v in formats %}
+        {% for v in record['distribution'].values() %}
           <gmd:onLine>
             <gmd:CI_OnlineResource>
               <gmd:linkage>
diff --git a/pygeometa/schemas/wmo_cmp/main.j2 b/pygeometa/schemas/wmo_cmp/main.j2
index c48d983..245d9be 100644
--- a/pygeometa/schemas/wmo_cmp/main.j2
+++ b/pygeometa/schemas/wmo_cmp/main.j2
@@ -377,8 +377,7 @@
       {% endif %}
       <gmd:transferOptions>
         <gmd:MD_DigitalTransferOptions>
-        {% set formats = prune_transfer_option(record['distribution'], record['identification']['language']) %}
-        {% for v in formats %}
+        {% for v in record['distribution'].values() %}
           <gmd:onLine>
             <gmd:CI_OnlineResource>
               <gmd:linkage>