diff --git a/LICENSE b/LICENSE
index 8bba651a9..f363b46e6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,11 +1,11 @@
 This software is open source software available under the BSD-3 license.
 
-Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights reserved.
-Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights reserved.
+Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 
 
-Copyright (c) 2020 Triad National Security, LLC. This program was produced
+Copyright (c) 2022 Triad National Security, LLC. This program was produced
 under U.S. Government contract 89233218CNA000001 for Los Alamos National
 Laboratory (LANL), which is operated by Triad National Security, LLC for the
 U.S. Department of Energy/National Nuclear Security Administration. All rights
@@ -16,7 +16,7 @@ irrevocable worldwide license in this material to reproduce, prepare derivative
 works, distribute copies to the public, perform publicly and display publicly,
 and to permit others to do so.
 
-Copyright (c) 2020 Lawrence Livermore National Security, LLC. This work was
+Copyright (c) 2022 Lawrence Livermore National Security, LLC. This work was
 produced under the auspices of the U.S. Department of Energy by Lawrence
 Livermore National Laboratory under Contract DE-AC52-07NA27344. This work was
 prepared as an account of work sponsored by an agency of the United States
diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml
index 9320bbed4..c1396472a 100644
--- a/ci/recipe/meta.yaml
+++ b/ci/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "MPAS-Analysis" %}
-{% set version = "1.6.1" %}
+{% set version = "1.7.0" %}
 
 package:
   name: {{ name|lower }}
@@ -27,12 +27,13 @@ requirements:
     - cartopy_offlinedata
     - cmocean
     - dask
+    - f90nml
     - geometric_features >=0.5.0
     - gsw
     - lxml
     - mache >=1.1.2
     - matplotlib-base >=3.0.2
-    - mpas_tools >=0.5.1
+    - mpas_tools >=0.14.0
     - nco >=4.8.1
     - netcdf4
     - numpy
@@ -46,7 +47,6 @@ requirements:
     - scipy
     - setuptools
     - shapely
-    - six
     - xarray >=0.14.1
 
 test:
diff --git a/dev-spec.txt b/dev-spec.txt
index ac43d1594..d731881eb 100644
--- a/dev-spec.txt
+++ b/dev-spec.txt
@@ -8,12 +8,13 @@ cartopy >=0.18.0
 cartopy_offlinedata
 cmocean
 dask
+f90nml
 geometric_features>=0.5.0
 gsw
 lxml
 mache >=1.1.2
 matplotlib-base>=3.0.2
-mpas_tools>=0.5.1
+mpas_tools>=0.14.0
 nco>=4.8.1
 netcdf4
 numpy
@@ -27,10 +28,10 @@ requests
 scipy
 setuptools
 shapely
-six
 xarray>=0.14.1
 
 # Development
+flake8
 git
 pip
 pytest
diff --git a/docs/api.rst b/docs/api.rst
index 4b7a32b02..a1a1ebfd0 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -135,17 +135,6 @@ Sea ice tasks
    PlotClimatologyMapSubtask.set_plot_info
 
 
-Configuration
-==============
-.. currentmodule:: mpas_analysis.configuration
-
-.. autosummary::
-   :toctree: generated/
-
-   MpasAnalysisConfigParser.getWithDefault
-   MpasAnalysisConfigParser.getExpression
-
-
 Shared modules
 ==============
 
diff --git a/docs/conf.py b/docs/conf.py
index 4e9fdd37a..987ac3fa2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -65,7 +65,7 @@
 # General information about the project.
 project = u'MPAS-Analysis'
 copyright = u'This software is open source software available under the BSD-3' \
-            u'license. Copyright (c) 2020 Triad National Security, LLC. ' \
+            u'license. Copyright (c) 2022 Triad National Security, LLC. ' \
             u'All rights reserved. Copyright (c) 2018 Lawrence Livermore ' \
             u'National Security, LLC. All rights reserved. Copyright (c) ' \
             u'2018 UT-Battelle, LLC. All rights reserved.'
diff --git a/docs/versions.rst b/docs/versions.rst
index 59e5fb66f..f9407897a 100644
--- a/docs/versions.rst
+++ b/docs/versions.rst
@@ -15,6 +15,7 @@ Documentation    On GitHub
 `v1.5.0`_        `1.5.0`_
 `v1.6.0`_        `1.6.0`_
 `v1.6.1`_        `1.6.1`_
+`v1.7.0`_        `1.7.0`_
 ================ ===============
 
 .. _`stable`: ../stable/index.html
@@ -28,6 +29,7 @@ Documentation    On GitHub
 .. _`v1.5.0`: ../1.5.0/index.html
 .. _`v1.6.0`: ../1.6.0/index.html
 .. _`v1.6.1`: ../1.6.1/index.html
+.. _`v1.7.0`: ../1.7.0/index.html
 .. _`master`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/master
 .. _`develop`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/develop
 .. _`1.2.6`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.2.6
@@ -39,3 +41,4 @@ Documentation    On GitHub
 .. _`1.5.0`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.5.0
 .. _`1.6.0`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.6.0
 .. _`1.6.1`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.6.1
+.. _`1.7.0`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.7.0
diff --git a/download_analysis_data.py b/download_analysis_data.py
index 0204a9a67..d6714c3e1 100755
--- a/download_analysis_data.py
+++ b/download_analysis_data.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
diff --git a/licenses/_headers/header-css b/licenses/_headers/header-css
index 51935faaa..b28084242 100755
--- a/licenses/_headers/header-css
+++ b/licenses/_headers/header-css
@@ -1,10 +1,10 @@
 /*
 / This software is open source software available under the BSD-3 license.
 /
-/ Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-/ Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+/ Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+/ Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 / reserved.
-/ Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+/ Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 /
 / Additional copyright and license information can be found in the LICENSE file
 / distributed with this code, or at
diff --git a/licenses/_headers/header-css-full b/licenses/_headers/header-css-full
index 0cf4809ed..a7b390bb1 100755
--- a/licenses/_headers/header-css-full
+++ b/licenses/_headers/header-css-full
@@ -1,9 +1,9 @@
 /*
 / This software is open source software available under the BSD-3 license.
 /
-/ Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-/ Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights reserved.
-/ Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+/ Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+/ Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights reserved.
+/ Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 /
 / Copyright 2018. Los Alamos National Security, LLC. This software was produced
 / under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National
diff --git a/licenses/_headers/header-html b/licenses/_headers/header-html
index d8dbbb4ed..2296e6812 100755
--- a/licenses/_headers/header-html
+++ b/licenses/_headers/header-html
@@ -1,10 +1,10 @@
 <!--
   - This software is open source software available under the BSD-3 license.
   -
-  - Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-  - Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+  - Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+  - Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
   - reserved.
-  - Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+  - Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
   -
   - Additional copyright and license information can be found in the LICENSE
   - file distributed with this code, or at
diff --git a/licenses/_headers/header-html-full b/licenses/_headers/header-html-full
index a3495a11f..086b96e58 100755
--- a/licenses/_headers/header-html-full
+++ b/licenses/_headers/header-html-full
@@ -1,9 +1,9 @@
 <!--
   - This software is open source software available under the BSD-3 license.
   -
-  - Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-  - Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights reserved.
-  - Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+  - Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+  - Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights reserved.
+  - Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
   -
   - Copyright 2018. Los Alamos National Security, LLC. This software was produced
   - under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National
diff --git a/licenses/_headers/header-ncl b/licenses/_headers/header-ncl
index 731bbbd41..95e0d9bfa 100755
--- a/licenses/_headers/header-ncl
+++ b/licenses/_headers/header-ncl
@@ -1,9 +1,9 @@
 ; This software is open source software available under the BSD-3 license.
 ;
-; Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-; Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+; Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+; Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 ; reserved.
-; Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+; Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 ;
 ; Additional copyright and license information can be found in the LICENSE file
 ; distributed with this code, or at
diff --git a/licenses/_headers/header-ncl-full b/licenses/_headers/header-ncl-full
index aa40da5f8..209527e0e 100755
--- a/licenses/_headers/header-ncl-full
+++ b/licenses/_headers/header-ncl-full
@@ -1,8 +1,8 @@
 ; This software is open source software available under the BSD-3 license.
 ;
-; Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-; Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights reserved.
-; Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+; Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+; Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights reserved.
+; Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 ;
 ; Copyright 2018. Los Alamos National Security, LLC. This software was produced
 ; under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National
diff --git a/licenses/_headers/header-py b/licenses/_headers/header-py
index 22814d7a2..2efc337cd 100755
--- a/licenses/_headers/header-py
+++ b/licenses/_headers/header-py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
diff --git a/licenses/_headers/header-py-full b/licenses/_headers/header-py-full
index 8b4720beb..66989228e 100755
--- a/licenses/_headers/header-py-full
+++ b/licenses/_headers/header-py-full
@@ -1,8 +1,8 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Copyright 2018. Los Alamos National Security, LLC. This software was produced
 # under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National
diff --git a/licenses/_headers/license-bump-copyright.sh b/licenses/_headers/license-bump-copyright.sh
index ca53647f7..6ba3d648d 100755
--- a/licenses/_headers/license-bump-copyright.sh
+++ b/licenses/_headers/license-bump-copyright.sh
@@ -8,10 +8,10 @@
 #
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
diff --git a/licenses/_headers/license-prepend-missing.sh b/licenses/_headers/license-prepend-missing.sh
index db8f8f095..09341771c 100755
--- a/licenses/_headers/license-prepend-missing.sh
+++ b/licenses/_headers/license-prepend-missing.sh
@@ -8,10 +8,10 @@
 #
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
diff --git a/licenses/_headers/license-setup.sh b/licenses/_headers/license-setup.sh
index 8831d785d..e804314d3 100755
--- a/licenses/_headers/license-setup.sh
+++ b/licenses/_headers/license-setup.sh
@@ -8,10 +8,10 @@
 #
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
diff --git a/licenses/_headers/update_license.py b/licenses/_headers/update_license.py
index db6ad7b51..05f10b93e 100755
--- a/licenses/_headers/update_license.py
+++ b/licenses/_headers/update_license.py
@@ -4,12 +4,12 @@
 
 extensions = ['py', 'sh', 'bash', 'html', 'css', 'js', 'ncl']
 
-replace = {'Copyright (c) 2020 Triad National Security, LLC.':
-           'Copyright (c) 2020 Triad National Security, LLC.',
-           'Copyright (c) 2020 Lawrence Livermore National Security, LLC.':
-           'Copyright (c) 2020 Lawrence Livermore National Security, LLC.',
-           'Copyright (c) 2020 UT-Battelle, LLC.':
-           'Copyright (c) 2020 UT-Battelle, LLC.'}
+replace = {'Copyright (c) 2022 Triad National Security, LLC.':
+           'Copyright (c) 2022 Triad National Security, LLC.',
+           'Copyright (c) 2022 Lawrence Livermore National Security, LLC.':
+           'Copyright (c) 2022 Lawrence Livermore National Security, LLC.',
+           'Copyright (c) 2022 UT-Battelle, LLC.':
+           'Copyright (c) 2022 UT-Battelle, LLC.'}
 
 files = []
 for ext in extensions:
diff --git a/mpas_analysis/__init__.py b/mpas_analysis/__init__.py
index 9c3b51e56..2aa385a38 100644
--- a/mpas_analysis/__init__.py
+++ b/mpas_analysis/__init__.py
@@ -3,5 +3,5 @@
 import matplotlib as mpl
 mpl.use('Agg')
 
-__version_info__ = (1, 6, 1)
+__version_info__ = (1, 7, 0)
 __version__ = '.'.join(str(vi) for vi in __version_info__)
diff --git a/mpas_analysis/__main__.py b/mpas_analysis/__main__.py
index ab9aef2f0..a0bb48be1 100755
--- a/mpas_analysis/__main__.py
+++ b/mpas_analysis/__main__.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -18,15 +18,11 @@
 # -------
 # Xylar Asay-Davis, Phillip J. Wolfram, Milena Veneziani
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import mpas_analysis
 
 import argparse
 import traceback
 import sys
-from importlib.resources import path
 import shutil
 import os
 from collections import OrderedDict
@@ -34,13 +30,12 @@
 import logging
 import xarray
 import time
-import configparser
 
 from mache import discover_machine, MachineInfo
 
-from mpas_analysis.shared.analysis_task import AnalysisFormatter
+from mpas_tools.config import MpasConfigParser
 
-from mpas_analysis.configuration import MpasAnalysisConfigParser
+from mpas_analysis.shared.analysis_task import AnalysisFormatter
 
 from mpas_analysis.shared.io.utility import build_config_full_path, \
     make_directories, copyfile
@@ -63,7 +58,7 @@
 from mpas_analysis.shared.regions import ComputeRegionMasks
 
 
-def update_time_bounds_in_config(config):  # {{{
+def update_time_bounds_in_config(config):
     """
     Updates the start and end year (and associated full date) for
     climatologies, time series and climate indices based on the files that are
@@ -71,7 +66,7 @@ def update_time_bounds_in_config(config):  # {{{
 
     Parameters
     ----------
-    config : ``MpasAnalysisConfigParser`` object
+    config : mpas_tools.config.MpasConfigParser
         contains config options
 
     """
@@ -80,20 +75,19 @@ def update_time_bounds_in_config(config):  # {{{
     for componentName in ['ocean', 'seaIce']:
         for section in ['climatology', 'timeSeries', 'index']:
             update_time_bounds_from_file_names(config, section, componentName)
-    # }}}
 
 
-def build_analysis_list(config, controlConfig):  # {{{
+def build_analysis_list(config, controlConfig):
     """
     Build a list of analysis tasks. New tasks should be added here, following
     the approach used for existing analysis tasks.
 
     Parameters
     ----------
-    config : ``MpasAnalysisConfigParser`` object
+    config : mpas_tools.config.MpasConfigParser
         contains config options
 
-    controlConfig : ``MpasAnalysisConfigParser`` object
+    controlConfig : mpas_tools.config.MpasConfigParser
         contains config options for a control run, or ``None`` if no config
         file for a control run was specified
 
@@ -252,10 +246,10 @@ def build_analysis_list(config, controlConfig):  # {{{
         config=config, mpasClimatologyTask=seaIceClimatolgyTask,
         hemisphere='SH', controlConfig=controlConfig))
 
-    return analyses  # }}}
+    return analyses
 
 
-def determine_analyses_to_generate(analyses, verbose):  # {{{
+def determine_analyses_to_generate(analyses, verbose):
     """
     Build a list of analysis tasks to run based on the 'generate' config
     option (or command-line flag) and prerequisites and subtasks of each
@@ -302,12 +296,12 @@ def determine_analyses_to_generate(analyses, verbose):  # {{{
 
     print('')
 
-    return analysesToGenerate  # }}}
+    return analysesToGenerate
 
 
 def add_task_and_subtasks(analysisTask, analysesToGenerate, verbose,
                           callCheckGenerate=True):
-    # {{{
+
     """
     If a task has been requested through the generate config option or
     if it is a prerequisite of a requested task, add it to the dictionary of
@@ -411,16 +405,15 @@ def add_task_and_subtasks(analysisTask, analysesToGenerate, verbose,
     analysisTask._setupStatus = 'success'
     assert(totalFailures == 0)
     return totalFailures
-    # }}}
 
 
-def update_generate(config, generate):  # {{{
+def update_generate(config, generate):
     """
     Update the 'generate' config option using a string from the command line.
 
     Parameters
     ----------
-    config : ``MpasAnalysisConfigParser`` object
+    config : mpas_tools.config.MpasConfigParser
         contains config options
 
     generate : str
@@ -438,16 +431,16 @@ def update_generate(config, generate):  # {{{
     generateString = ', '.join(["'{}'".format(element)
                                 for element in generateList])
     generateString = '[{}]'.format(generateString)
-    config.set('output', 'generate', generateString)  # }}}
+    config.set('output', 'generate', generateString)
 
 
-def run_analysis(config, analyses):  # {{{
+def run_analysis(config, analyses):
     """
     Run all the tasks, either in serial or in parallel
 
     Parameters
     ----------
-    config : ``MpasAnalysisConfigParser`` object
+    config : mpas_tools.config.MpasConfigParser
         contains config options
 
     analyses : OrderedDict of ``AnalysisTask`` objects
@@ -474,8 +467,7 @@ def run_analysis(config, analyses):  # {{{
     config.write(configFile)
     configFile.close()
 
-    parallelTaskCount = config.getWithDefault('execute', 'parallelTaskCount',
-                                              default=1)
+    parallelTaskCount = config.getint('execute', 'parallelTaskCount')
 
     isParallel = parallelTaskCount > 1 and len(analyses) > 1
 
@@ -626,10 +618,8 @@ def run_analysis(config, analyses):  # {{{
         print('Log files for executed tasks can be found in {}'.format(
             logsDirectory))
 
-    # }}}
-
 
-def wait_for_task(runningTasks, timeout=0.1):  # {{{
+def wait_for_task(runningTasks, timeout=0.1):
     """
     Build a list of analysis modules based on the 'generate' config option.
     New tasks should be added here, following the approach used for existing
@@ -655,7 +645,7 @@ def wait_for_task(runningTasks, timeout=0.1):  # {{{
         for analysisTask in runningTasks.values():
             analysisTask.join(timeout=timeout)
             if not analysisTask.is_alive():
-                return analysisTask  # }}}
+                return analysisTask
 
 
 def purge_output(config):
@@ -693,12 +683,12 @@ def purge_output(config):
                         shutil.rmtree(directory)
 
 
-def symlink_main_run(config, defaultConfig):
-    '''
+def symlink_main_run(config):
+    """
     Create symlinks to the climatology and time-series directories for the
-    main run that has aleady been computed so we don't have to recompute
+    main run that has already been computed so we don't have to recompute
     the analysis.
-    '''
+    """
 
     def link_dir(section, option):
         destDirectory = build_config_full_path(config=config, section='output',
@@ -722,11 +712,9 @@ def link_dir(section, option):
     if not os.path.exists(mainConfigFile):
         raise OSError('A main config file {} was specified but the '
                       'file does not exist'.format(mainConfigFile))
-    mainConfigFiles = [mainConfigFile]
-    if defaultConfig is not None:
-        mainConfigFiles = [defaultConfig] + mainConfigFiles
-    mainConfig = MpasAnalysisConfigParser()
-    mainConfig.read(mainConfigFiles)
+    mainConfig = MpasConfigParser()
+    mainConfig.add_from_package('mpas_analysis', 'default.cfg')
+    mainConfig.add_user_config(mainConfigFile)
 
     for subdirectory in ['mpasClimatology', 'timeSeries', 'mapping', 'mask',
                          'profiles']:
@@ -768,8 +756,8 @@ def main():
     parser.add_argument("-p", "--purge", dest="purge", action='store_true',
                         help="Purge the analysis by deleting the output"
                         "directory before running")
-    parser.add_argument('config_files', metavar='CONFIG',
-                        type=str, nargs='*', help='config file')
+    parser.add_argument("config_file", metavar="CONFIG", type=str, nargs='*',
+                        help="config file")
     parser.add_argument("--plot_colormaps", dest="plot_colormaps",
                         action='store_true',
                         help="Make a plot displaying all available colormaps")
@@ -789,16 +777,11 @@ def main():
         parser.print_help()
         sys.exit(0)
 
-    for config_file in args.config_files:
-        if not os.path.exists(config_file):
-            raise OSError(f'Config file {config_file} not found.')
-
-    shared_configs = list()
+    config = MpasConfigParser()
 
     # add default.cfg to cover default not included in the config files
     # provided on the command line
-    with path('mpas_analysis', 'default.cfg') as default_config:
-        shared_configs.append(str(default_config))
+    config.add_from_package('mpas_analysis', 'default.cfg')
 
     # Add config options for E3SM supported machines from the mache package
     machine = args.machine
@@ -811,12 +794,10 @@ def main():
 
     if machine is not None:
         print(f'Detected E3SM supported machine: {machine}')
-        with path('mache.machines', f'{machine}.cfg') as machine_config:
-            shared_configs.append(str(machine_config))
+        config.add_from_package('mache.machines', f'{machine}.cfg')
         try:
-            with path('mpas_analysis.configuration', f'{machine}.cfg') \
-                    as machine_config:
-                shared_configs.append(str(machine_config))
+            config.add_from_package('mpas_analysis.configuration',
+                                    f'{machine}.cfg')
         except FileNotFoundError:
             # we don't have a config file for this machine, so we'll just
             # skip it.
@@ -825,24 +806,24 @@ def main():
             pass
 
     if args.polar_regions:
-        with path('mpas_analysis', 'polar_regions.cfg') as polar_config:
-            shared_configs.append(str(polar_config))
-
-    main_configs = shared_configs + args.config_files
-    print('Using the following config files:')
-    for config_file in main_configs:
-        if not os.path.exists(config_file):
-            raise OSError('Config file {config_file} not found.')
-        print(f'   {config_file}')
+        config.add_from_package('mpas_analysis', 'polar_regions.cfg')
 
-    config = MpasAnalysisConfigParser(
-        interpolation=configparser.ExtendedInterpolation())
     if machine is not None:
         # set the username so we can use it in the htmlSubdirectory
         machine_info = MachineInfo(machine=machine)
-        config.add_section('web_portal')
         config.set('web_portal', 'username', machine_info.username)
-    config.read(main_configs)
+
+    shared_configs = config.list_files()
+
+    for user_config in args.config_file:
+        if not os.path.exists(user_config):
+            raise OSError(f'Config file {user_config} not found.')
+
+        config.add_user_config(user_config)
+
+    print('Using the following config files:')
+    for config_file in config.list_files():
+        print(f'   {config_file}')
 
     if args.list:
         # set this config option so we don't have issues
@@ -864,11 +845,14 @@ def main():
         if not os.path.exists(control_config_file):
             raise OSError('A control config file {} was specified but the '
                           'file does not exist'.format(control_config_file))
-        control_configs = shared_configs + [control_config_file]
 
-        control_config = MpasAnalysisConfigParser(
-            interpolation=configparser.ExtendedInterpolation())
-        control_config.read(control_configs)
+        control_config = MpasConfigParser()
+        for config_file in shared_configs:
+            if config_file.endswith('.py'):
+                # we'll skip config options set in python files
+                continue
+            control_config.add_from_file(config_file)
+        control_config.add_user_config(control_config_file)
 
         # replace the log directory so log files get written to this run's
         # log directory, not the control run's
@@ -887,7 +871,7 @@ def main():
         purge_output(config)
 
     if config.has_option('runs', 'mainRunConfigFile'):
-        symlink_main_run(config, default_config)
+        symlink_main_run(config)
 
     if args.generate:
         update_generate(config, args.generate)
@@ -915,7 +899,7 @@ def main():
     html_base_directory = build_config_full_path(config, 'output',
                                                  'htmlSubdirectory')
     make_directories(html_base_directory)
-    for config_filename in args.config_files:
+    for config_filename in args.config_file:
         config_filename = os.path.abspath(config_filename)
         print(f'copying {config_filename} to HTML dir.')
         basename = os.path.basename(config_filename)
@@ -937,10 +921,8 @@ def main():
         print('Total run time: {}:{:02d}:{:05.2f}'.format(h, m, s))
 
     if not args.setup_only:
-        generate_html(config, analyses, control_config, args.config_files)
+        generate_html(config, analyses, control_config, args.config_file)
 
 
 if __name__ == "__main__":
     main()
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/analysis_task_template.py b/mpas_analysis/analysis_task_template.py
index e4ff9dd2a..a1fb34e56 100644
--- a/mpas_analysis/analysis_task_template.py
+++ b/mpas_analysis/analysis_task_template.py
@@ -1,14 +1,14 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-'''
+"""
 This is an example analysis task to be used as a template for new tasks.
 It should be copied into one of the component folders (`ocean`, `sea_ice`,
 `land_ice`, etc.) and modified as needed.
@@ -38,14 +38,11 @@
    to be generated and is set up properly.
 
 Don't forget to remove this docstring. (It's not needed.)
-'''
+"""
 # Authors
 # -------
 # Xylar Asay-Davis
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 # import python modules here
 import numpy
 import matplotlib.pyplot as plt
@@ -66,11 +63,12 @@
 # parent, "inhereting" several variables and methods (functions) from it that
 # can be helpful in initializing, checking whether to perform analysis and
 # performing the analysis.  See AnalysisTask in shared/analysis_task.py
-class MyTask(AnalysisTask):  # {{{
-    '''
+class MyTask(AnalysisTask):
+    """
     <Briefly describe the analysis task here.  Just a 1-2 sentence description
     of what the task does should be sufficient.>
-    '''
+    """
+
     # Authors
     # -------
     # <List of authors>
@@ -86,8 +84,8 @@ class MyTask(AnalysisTask):  # {{{
     #    python class start with the argument self, which is not included in
     #    the list of arguments when you call a method of an object (because it
     #    is always included automatically).
-    # config is an MpasAnalysisConfigParser object that can be used to get
-    #    configuration options stored in default.cfg or a custom config
+    # config is an mpas_tools.config.MpasConfigParser object that can be used
+    #    to get configuration options stored in default.cfg or a custom config
     #    file specific to a given simulation.  See examples below or in
     #    existing analysis tasks.
     # myArg should either be modified or removed. An example might be if you
@@ -98,14 +96,14 @@ class MyTask(AnalysisTask):  # {{{
     #        def __init__(self, config, fieldName):...
     #    and yu would then make a new task something like this:
     #        myTask = MyTask(config, fieldName='seaIceArea')
-    def __init__(self, config, prerequsiteTask, myArg='myDefaultValue'):  # {{{
-        '''
+    def __init__(self, config, prerequsiteTask, myArg='myDefaultValue'):
+        """
         Construct the analysis task.
         <Add any additional description of what happens during construction>
 
         Parameters
         ----------
-        config :  instance of MpasAnalysisConfigParser
+        config :  mpas_tools.config.MpasConfigParser
             Contains configuration options
 
         prerequsiteTask : ``AnotherTaskClass``
@@ -116,7 +114,7 @@ def __init__(self, config, prerequsiteTask, myArg='myDefaultValue'):  # {{{
         myArg : str, optional
             <Describe the arg, or just remove remove it>
 
-        '''
+        """
         # Authors
         # -------
         # <List of authors>
@@ -188,21 +186,19 @@ def __init__(self, config, prerequsiteTask, myArg='myDefaultValue'):  # {{{
         # MyPlotObservationsSubtask but they would be qualitatively similar
         # to MySubtask below.
 
-        # }}}
-
     # this function will be called to figure out if the analysis task should
     # run.  It should check if the input arguments to the task are supported,
     # if appropriate analysis member(s) (AMs) were turned on, if the necessary
     # output files exist, etc.  If there is a problem, an exception should be
     # raised (see the example below) so the task will not be run.
-    def setup_and_check(self):  # {{{
-        '''
+    def setup_and_check(self):
+        """
         Perform steps to set up the analysis and check for errors in the setup.
 
         Raises
         ------
         ValueError: <if myArg has an invalid value; modify as needed>
-        '''
+        """
         # Authors
         # -------
         # <List of authors>
@@ -300,7 +296,7 @@ def setup_and_check(self):  # {{{
         # plotParameters is a list of parameters, a stand-ins for whatever
         # you might want to include in each plot name, for example, seasons or
         # types of observation.
-        self.plotParameters = self.config.getExpression(self.taskName,
+        self.plotParameters = self.config.getexpression(self.taskName,
                                                         'plotParameters')
 
         mainRunName = self.config.get('runs', 'mainRunName')
@@ -312,12 +308,10 @@ def setup_and_check(self):  # {{{
                                                         filePrefix))
             self.filePrefixes[plotParameter] = filePrefix
 
-        # }}}
-
-    def run_task(self):  # {{{
-        '''
+    def run_task(self):
+        """
         The main method of the task that performs the analysis task.
-        '''
+        """
         # Authors
         # -------
         # <List of authors>
@@ -332,7 +326,6 @@ def run_task(self):  # {{{
         # one for each of our plotParameters (e.g. seasons)
         for plotParameter in self.plotParameters:
             self._make_plot(plotParameter)
-        # }}}
 
     # here is where you add helper methods that are meant to be non-public
     # (they start with an underscore), meaning you don't expect anyone to
@@ -342,8 +335,8 @@ def run_task(self):  # {{{
     # you can either pass arguments (with or without defaults) or you can
     # 'save' arguments as member variables of `self` and then get them back
     # (like `self.myArg` here).
-    def _make_plot(self, plotParameter, optionalArgument=None):  # {{{
-        '''
+    def _make_plot(self, plotParameter, optionalArgument=None):
+        """
         Make a simple plot
 
         Parameters
@@ -355,7 +348,7 @@ def _make_plot(self, plotParameter, optionalArgument=None):  # {{{
             An optional argument
 
         <Performs my favorite subtask>
-        '''
+        """
 
         # perform the task
         # self.myArg is a copy of the argument we passed in to __init__ when we
@@ -372,7 +365,7 @@ def _make_plot(self, plotParameter, optionalArgument=None):  # {{{
 
         # make the plot
         x = numpy.linspace(0, 1, 1000)
-        plt.plot(x, x**2)
+        plt.plot(x, x ** 2)
         # save the plot to the output file
         plt.savefig(outFileName)
 
@@ -399,8 +392,6 @@ def _make_plot(self, plotParameter, optionalArgument=None):  # {{{
             imageDescription=caption,
             imageCaption=caption)
 
-        # }}}
-
 
 class MySubtask(AnalysisTask):
     def __init__(self, parentTask, season):
@@ -417,8 +408,8 @@ def setup_and_check(self):
         # do whatever setup is needed for the subtask.  You don't have
         # to redundantly do setup that happened in parentTask because
         # you can access its fields if needed
-        assert(self.parentTask.streamName ==
-               'timeSeriesStatsMonthlyOutput')
+        assert (self.parentTask.streamName ==
+                'timeSeriesStatsMonthlyOutput')
 
     def run_analsysis(self):
         # do the main action of the subplot.  Note: you can't access any
@@ -429,5 +420,3 @@ def run_analsysis(self):
         pass
 
 # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/configuration/__init__.py b/mpas_analysis/configuration/__init__.py
index 644ae9562..e69de29bb 100644
--- a/mpas_analysis/configuration/__init__.py
+++ b/mpas_analysis/configuration/__init__.py
@@ -1,2 +0,0 @@
-from mpas_analysis.configuration.mpas_analysis_config_parser import \
-    MpasAnalysisConfigParser
diff --git a/mpas_analysis/configuration/anvil.cfg b/mpas_analysis/configuration/anvil.cfg
index d8097d947..8119d1e34 100644
--- a/mpas_analysis/configuration/anvil.cfg
+++ b/mpas_analysis/configuration/anvil.cfg
@@ -14,7 +14,9 @@ ncclimoParallelMode = bck
 # the number of total threads to use when ncclimo runs in "bck" or "mpi" mode.
 # Reduce this number if ncclimo is crashing (maybe because it is out of memory).
 # The number of threads must be a factor of 12 (1, 2, 3, 4, 6 or 12).
-ncclimoThreads = 12
+
+# Anvil is experiencing out-of-memory errors with 12 tasks so reducing to 6
+ncclimoThreads = 6
 
 # the number of MPI tasks to use in creating mapping files (1 means tasks run in
 # serial, the default)
diff --git a/mpas_analysis/configuration/mpas_analysis_config_parser.py b/mpas_analysis/configuration/mpas_analysis_config_parser.py
deleted file mode 100644
index bbda4346a..000000000
--- a/mpas_analysis/configuration/mpas_analysis_config_parser.py
+++ /dev/null
@@ -1,132 +0,0 @@
-# This software is open source software available under the BSD-3 license.
-#
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
-# reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
-#
-# Additional copyright and license information can be found in the LICENSE file
-# distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-"""
-A configuratin parser class for MPAS analysis.  MpasAnalysisConfigParser adds
-the capabilities to get an option including a default value
-(``getWithDefault(section, option, default, ...)``) and to get options
-that are lists, tuples, dicts, etc (``getExpression(section, option)``).
-"""
-# Authors
-# -------
-# Xylar Asay-Davis, Phillip J. Wolfram
-
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
-import numbers
-import ast
-import six
-import numpy as np
-
-from six.moves.configparser import ConfigParser
-
-if six.PY3:
-    xrange = range
-
-npallow = dict(linspace=np.linspace, xrange=xrange, range=range, array=np.array,
-               arange=np.arange, pi=np.pi, Pi=np.pi, int=int, __builtins__=None)
-
-
-class MpasAnalysisConfigParser(ConfigParser):
-
-    def getWithDefault(self, section, option, default):
-        """
-        Get an option, using the supplied default value if the option is not
-        present.
-
-        Parameters
-        ----------
-        section : str
-            The section in the config file
-
-        option : str
-            The option in the config file
-
-        default : {bool, int, float, list, tuple, dict, str}
-            The default value if the option and/or section is not found, used
-            to determine the type of the option if it *is* found. If
-            ``default`` is a list, tuple, or dict, ``getExpression(...)`` is
-            used if the option is present in the config file.
-        """
-        # Authors
-        # -------
-        # Xylar Asay-Davis
-
-        if self.has_section(section):
-            if self.has_option(section, option):
-                if isinstance(default, bool):
-                    return self.getboolean(section, option)
-                elif isinstance(default, numbers.Integral):
-                    return self.getint(section, option)
-                elif isinstance(default, numbers.Real):
-                    return self.getfloat(section, option)
-                elif isinstance(default, (list, tuple, dict)):
-                    return self.getExpression(section, option)
-                else:
-                    return self.get(section, option)
-
-        # we didn't find the entry so set it to the default
-        if not self.has_section(section):
-            self.add_section(section)
-        self.set(section, option, str(default))
-        return default
-
-    def getExpression(self, section, option, elementType=None,
-                      usenumpyfunc=False):
-        """
-        Get an option as an expression (typically a list, though tuples and
-        dicts are also available).  The expression is required to have valid
-        python syntax, so that string entries are required to be in single or
-        double quotes.
-
-        Parameters
-        ----------
-        section : str
-            The section in the config file
-
-        option : str
-            The option in the config file
-
-        elementType : {bool, int, float, list, tuple, str}, optional
-            If supplied, each element in a list or tuple, or
-            each value in a dictionary are cast to this type.  This is likely
-            most useful for ensuring that all elements in a list of numbers are
-            of type float, rather than int, when the distinction is important.
-
-        usenumpyfunc : bool, optional
-            If ``True``, the expression is evaluated including functionality
-            from the numpy package (which can be referenced either as ``numpy``
-            or ``np``).
-        """
-        # Authors
-        # -------
-        # Xylar Asay-Davis, Phillip J. Wolfram
-
-        expressionString = self.get(section, option)
-        if usenumpyfunc:
-            assert '__' not in expressionString, \
-                "'__' is not allowed in {} "\
-                "for `usenumpyfunc=True`".format(expressionString)
-            sanitizedstr = expressionString.replace('np.', '')\
-                                           .replace('numpy.', '')\
-                                           .replace('__', '')
-            result = eval(sanitizedstr, npallow)
-        else:
-            result = ast.literal_eval(expressionString)
-
-        if elementType is not None:
-            if isinstance(result, (list, tuple)):
-                result = [elementType(element) for element in result]
-            elif isinstance(result, dict):
-                for key in result:
-                    result[key] = elementType(result[key])
-
-        return result
diff --git a/mpas_analysis/default.cfg b/mpas_analysis/default.cfg
index b81528b02..563e9f913 100644
--- a/mpas_analysis/default.cfg
+++ b/mpas_analysis/default.cfg
@@ -579,6 +579,11 @@ contourLevelsResult = np.arange(-2.5, 2.6, 0.5)
 # commented out to determine the distance between ticks automatically.
 # yearStrideXTicks = 1
 
+# Number of points over which to compute moving average(e.g., for monthly
+# output, movingAveragePoints=12 corresponds to a 12-month moving average
+# window)
+movingAveragePoints = 12
+
 
 [hovmollerTemperatureAnomaly]
 ## options related to plotting time series of potential temperature vs. depth
@@ -1473,7 +1478,7 @@ iceShelvesToPlot = ['Antarctica', 'Peninsula', 'West Antarctica',
                     'Thwaites', 'Pine_Island', 'Abbot', 'George_VI']
 
 # Number of months over which to compute moving average
-movingAverageMonths = 1
+movingAveragePoints = 1
 
 # An optional first year for the tick marks on the x axis. Leave commented out
 # to start at the beginning of the time series.
@@ -1514,6 +1519,12 @@ variables = [{'name': 'temperature',
               'title': 'Potential Density',
               'units': 'kg m$$^{-3}$$',
               'mpas': 'timeMonthly_avg_potentialDensity'},
+             {'name': 'thermalForcing',
+              'title': 'Thermal Forcing',
+              'units': r'$$^\circ$$C',
+              'mpas': ['timeMonthly_avg_activeTracers_temperature',
+                       'timeMonthly_avg_activeTracers_salinity',
+                       'timeMonthly_avg_density']},
              {'name': 'mixedLayerDepth',
               'title': 'Mixed Layer Depth',
               'units': 'm',
@@ -1542,7 +1553,7 @@ transectsToPlot = ['Drake Passage', 'Tasmania-Ant', 'Africa-Ant',
                    'Denmark Strait', 'Iceland-Faroe-Scotland']
 
 # Number of months over which to compute moving average
-movingAverageMonths = 1
+movingAveragePoints = 1
 
 # An optional first year for the tick marks on the x axis. Leave commented out
 # to start at the beginning of the time series.
@@ -2348,7 +2359,7 @@ numUpperTicks = 8
 # for values at upper axis ticks.  This value can be adjusted (in concert
 # with numUpperTicks) to avoid problems with overlapping numbers along the
 # upper axis.
-upperXAxisTickLabelPrecision = 2
+upperXAxisTickLabelPrecision = 1
 
 # Whether or not to compare fields on transects by displaying their contours
 # on a single pane plot.  If True, this will be done;  if False, the fields
@@ -2360,6 +2371,9 @@ upperXAxisTickLabelPrecision = 2
 # will be displayed as a heatmap (possibly also with contours)
 compareAsContoursOnSinglePlot = False
 
+# the line width to use for contours on heatmaps
+contourLineWidth = 1
+
 # the line style to use for contours on heatmaps and for
 # contours of the model field on contour comparison plots
 contourLineStyle = solid
@@ -2368,6 +2382,14 @@ contourLineStyle = solid
 # contours of the model field on contour comparison plots
 contourLineColor = black
 
+# the line width to use for contours of the model field on contour comparison
+# plots
+mainContourLineWidth = 2
+
+# the line width to use for observation or reference model contours in a
+# contour comparison plots
+comparisonContourLineWidth = 1
+
 # the line style to use for contours of the reference field
 # on contour comparison plots
 comparisonContourLineStyle = solid
@@ -2380,7 +2402,7 @@ comparisonContourLineColor = red
 labelContoursOnHeatmaps = False
 
 # whether or not to label contours on contour comparison plots
-labelContoursOnContourComparisonPlots = True
+labelContoursOnContourComparisonPlots = False
 
 # the precision to use for contour labels
 contourLabelPrecision = 1
@@ -2545,6 +2567,16 @@ normArgsDifference = {'vmin': -0.3, 'vmax': 0.3}
 contourLevelsDifference = []
 
 
+[wocePotentialDensityContourTransects]
+## options related to plotting WOCE transects with potential density contours
+
+# Whether to plot the transect as a single contour plot, as opposed to separate
+# panels for model, reference and difference.
+compareAsContoursOnSinglePlot = True
+
+contourLevelsResult = [1027.2, 1027.4, 1027.6, 1027.7, 1027.8, 1027.85, 1027.9, 1027.95, 1028.0]
+
+
 [geojsonTransects]
 ## options related to plotting model transects at points determined by a
 ## geojson file.  To generate your own geojson file, go to:
@@ -2830,9 +2862,10 @@ maxLat = -60
 longitudes = [318., 280., 253., 187., 117., 75., 0.]
 
 # a list of fields top plot for each transect.  All supported fields are listed
-# below.  Note that 'velocityMagnitude' cannot be plotted without
-# 'zonalVelocity' and 'meridionalVelocity' because the components are needed
-# to compute the magnitude.
+# below except 'potentialDensityContour', which is not plotted by default.
+# Note that 'velocityMagnitude' cannot be plotted without 'zonalVelocity' and
+# 'meridionalVelocity' because the components are needed to compute the
+# magnitude.
 fieldList = ['temperature', 'salinity', 'potentialDensity', 'zonalVelocity',
              'meridionalVelocity', 'velocityMagnitude']
 
@@ -3056,6 +3089,16 @@ normArgsDifference = {'vmin': -0.2, 'vmax': 0.2}
 #contourLevelsDifference = numpy.linspace(-0.2, 0.2, 9)
 contourLevelsDifference = 'none'
 
+[sosePotentialDensityContourTransects]
+## options related to plotting SOSE transects of potential density
+
+# Whether to plot the transect as a single contour plot, as opposed to separate
+# panels for model, reference and difference.
+compareAsContoursOnSinglePlot = True
+
+contourLevelsResult = [1027.2, 1027.4, 1027.6, 1027.7, 1027.8, 1027.85, 1027.9, 1027.95, 1028.0]
+
+
 [climatologyMapBGC]
 ## options related to plotting climatology mpas of BGC
 
@@ -3319,9 +3362,9 @@ regionNames = ["Atlantic_Basin", "Pacific_Basin", "Indian_Basin",
 computeAnomaly = False
 
 # Number of points over which to compute moving average(e.g., for monthly
-# output, movingAverageMonths=12 corresponds to a 12-month moving average
+# output, movingAveragePoints=12 corresponds to a 12-month moving average
 # window)
-movingAverageMonths = 12
+movingAveragePoints = 12
 
 
 [hovmollerOceanRegionsPotentialTemperature]
diff --git a/mpas_analysis/download_data.py b/mpas_analysis/download_data.py
index 6399f3336..8f1ac9f79 100755
--- a/mpas_analysis/download_data.py
+++ b/mpas_analysis/download_data.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -17,9 +17,6 @@
 # -------
 # Xylar Asay-Davis, Phillip J. Wolfram, Milena Veneziani
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 
 import argparse
 import pkg_resources
@@ -60,5 +57,3 @@ def download_analysis_data():
     analysisFileList = list(filter(None, analysisFileList.split('\n')))
     download_files(analysisFileList, urlBase, args.outDir, verify=True)
 
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/obs/make_obs_readme_bibtex.py b/mpas_analysis/obs/make_obs_readme_bibtex.py
index 393b7c801..6785ea4e9 100755
--- a/mpas_analysis/obs/make_obs_readme_bibtex.py
+++ b/mpas_analysis/obs/make_obs_readme_bibtex.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -18,9 +18,6 @@
 Xylar Asay-Davis
 """
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xml.etree.ElementTree as ET
 import argparse
 import re
diff --git a/mpas_analysis/ocean/climatology_map_antarctic_melt.py b/mpas_analysis/ocean/climatology_map_antarctic_melt.py
index dfa6d2e75..68c5636b6 100644
--- a/mpas_analysis/ocean/climatology_map_antarctic_melt.py
+++ b/mpas_analysis/ocean/climatology_map_antarctic_melt.py
@@ -1,16 +1,13 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import os
 import csv
 import xarray as xr
@@ -36,7 +33,7 @@
 from mpas_analysis.shared.constants import constants
 
 
-class ClimatologyMapAntarcticMelt(AnalysisTask):  # {{{
+class ClimatologyMapAntarcticMelt(AnalysisTask):
     """
     An analysis task for comparison of Antarctic melt rates against
     observations
@@ -46,13 +43,13 @@ class ClimatologyMapAntarcticMelt(AnalysisTask):  # {{{
     # Xylar Asay-Davis
 
     def __init__(self, config, mpasClimatologyTask, regionMasksTask,
-                 controlConfig):  # {{{
+                 controlConfig):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
@@ -61,7 +58,7 @@ def __init__(self, config, mpasClimatologyTask, regionMasksTask,
         regionMasksTask : ``ComputeRegionMasks``
             A task for computing region masks
 
-        controlConfig :  ``MpasAnalysisConfigParser``
+        controlconfig : mpas_tools.config.MpasConfigParser
             Configuration options for a control run
         """
         # Authors
@@ -82,13 +79,13 @@ def __init__(self, config, mpasClimatologyTask, regionMasksTask,
         iselValues = None
 
         # read in what seasons we want to plot
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         if len(seasons) == 0:
             raise ValueError('config section {} does not contain valid list '
                              'of seasons'.format(sectionName))
 
-        comparisonGridNames = config.getExpression(sectionName,
+        comparisonGridNames = config.getexpression(sectionName,
                                                    'comparisonGrids')
 
         makeTables = config.getboolean(sectionName, 'makeTables')
@@ -170,9 +167,8 @@ def __init__(self, config, mpasClimatologyTask, regionMasksTask,
                     galleryName=galleryName)
 
                 self.add_subtask(subtask)
-        # }}}
 
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
         """
@@ -191,11 +187,9 @@ def setup_and_check(self):  # {{{
                              '    to be standalone or coupled.  Otherwise, no '
                              'melt rates are available \n'
                              '    for plotting.')
-        # }}}
-    # }}}
 
 
-class RemapMpasAntarcticMeltClimatology(RemapMpasClimatologySubtask):  # {{{
+class RemapMpasAntarcticMeltClimatology(RemapMpasClimatologySubtask):
     """
     A subtask for remapping climatologies of Antarctic melt rates and adding
 
@@ -209,7 +203,7 @@ class RemapMpasAntarcticMeltClimatology(RemapMpasClimatologySubtask):  # {{{
     # -------
     # Xylar Asay-Davis
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Compute climatologies of melt rates from E3SM/MPAS output
 
@@ -231,9 +225,7 @@ def run_task(self):  # {{{
         # which will perform the main function of the task
         super(RemapMpasAntarcticMeltClimatology, self).run_task()
 
-        # }}}
-
-    def customize_masked_climatology(self, climatology, season):  # {{{
+    def customize_masked_climatology(self, climatology, season):
         """
         Mask the melt rates using ``landIceMask`` and rescale it to m/yr
 
@@ -261,13 +253,11 @@ def customize_masked_climatology(self, climatology, season):  # {{{
             constants.sec_per_year / constants.rho_fw * \
             climatology[fieldName].where(self.landIceMask)
 
-        return climatology  # }}}
-
-    # }}}
+        return climatology
 
 
 class RemapObservedAntarcticMeltClimatology(RemapObservedClimatologySubtask):
-    # {{{
+
     """
     A subtask for reading and remapping Antarctic melt-rate observations
     """
@@ -275,7 +265,7 @@ class RemapObservedAntarcticMeltClimatology(RemapObservedClimatologySubtask):
     # -------
     # Xylar Asay-Davis
 
-    def get_observation_descriptor(self, fileName):  # {{{
+    def get_observation_descriptor(self, fileName):
         """
         get a MeshDescriptor for the observation grid
 
@@ -298,9 +288,9 @@ def get_observation_descriptor(self, fileName):  # {{{
         projection = get_pyproj_projection(comparison_grid_name='antarctic')
         obsDescriptor = ProjectionGridDescriptor.read(
             projection, fileName=fileName, xVarName='x', yVarName='y')
-        return obsDescriptor  # }}}
+        return obsDescriptor
 
-    def build_observational_dataset(self, fileName):  # {{{
+    def build_observational_dataset(self, fileName):
         """
         read in the data sets for observations, and possibly rename some
         variables and dimensions
@@ -322,14 +312,12 @@ def build_observational_dataset(self, fileName):  # {{{
         # Load MLD observational data
         dsObs = xr.open_dataset(fileName)
 
-        return dsObs  # }}}
-
-    # }}}
+        return dsObs
 
 
 class AntarcticMeltTableSubtask(AnalysisTask):
     def __init__(self, parentTask, mpasClimatologyTask, controlConfig,
-                 regionMasksTask, season, subtaskName=None):  # {{{
+                 regionMasksTask, season, subtaskName=None):
         """
         Construct the analysis task.
 
@@ -342,7 +330,7 @@ def __init__(self, parentTask, mpasClimatologyTask, controlConfig,
         mpasClimatologyTask : ``MpasClimatologyTask``
             The task that produced the climatology to be remapped and plotted
 
-        controlConfig :  ``MpasAnalysisConfigParser``
+        controlconfig : mpas_tools.config.MpasConfigParser
             Configuration options for a control run (if any)
 
         regionMasksTask : ``ComputeRegionMasks``
@@ -381,9 +369,8 @@ def __init__(self, parentTask, mpasClimatologyTask, controlConfig,
 
         self.run_after(self.masksSubtask)
         self.run_after(mpasClimatologyTask)
-        # }}}
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Computes and plots table of Antarctic sub-ice-shelf melt rates.
         """
@@ -395,7 +382,7 @@ def run_task(self):  # {{{
         config = self.config
 
         sectionName = self.taskName
-        iceShelvesInTable = config.getExpression(sectionName,
+        iceShelvesInTable = config.getexpression(sectionName,
                                                  'iceShelvesInTable')
         if len(iceShelvesInTable) == 0:
             return
@@ -537,9 +524,3 @@ def run_task(self):  # {{{
                     row[controlRunName] = \
                         '{}'.format(dsControl.totalMeltFlux[index].values)
                 writer.writerow(row)
-
-        # }}}
-    # }}}
-
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/ocean/climatology_map_argo.py b/mpas_analysis/ocean/climatology_map_argo.py
index f68267d3c..a4fe2405e 100644
--- a/mpas_analysis/ocean/climatology_map_argo.py
+++ b/mpas_analysis/ocean/climatology_map_argo.py
@@ -1,16 +1,16 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-'''
+"""
 Analysis tasks for comparing Global climatology maps against Argo data.
-'''
+"""
 # Authors
 # -------
 # Luke Van Roekel
@@ -33,29 +33,30 @@
 from mpas_analysis.shared.climatology import RemapObservedClimatologySubtask
 
 
-class ClimatologyMapArgoTemperature(AnalysisTask):  # {{{
+class ClimatologyMapArgoTemperature(AnalysisTask):
     """
     An analysis task for comparison of potential temperature against Argo
     observations
     """
+
     # Authors
     # -------
     # Luke Van Roekel, Xylar Asay-Davis
 
     def __init__(self, config, mpasClimatologyTask,
-                 controlConfig=None):  # {{{
+                 controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
             The task that produced the climatology to be remapped and plotted
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -76,20 +77,20 @@ def __init__(self, config, mpasClimatologyTask,
         iselValues = None
 
         # read in what seasons we want to plot
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         if len(seasons) == 0:
             raise ValueError('config section {} does not contain valid list '
                              'of seasons'.format(sectionName))
 
-        comparisonGridNames = config.getExpression(sectionName,
+        comparisonGridNames = config.getexpression(sectionName,
                                                    'comparisonGrids')
 
         if len(comparisonGridNames) == 0:
             raise ValueError('config section {} does not contain valid list '
                              'of comparison grids'.format(sectionName))
 
-        depths = config.getExpression(sectionName, 'depths')
+        depths = config.getexpression(sectionName, 'depths')
 
         if len(depths) == 0:
             raise ValueError('config section {} does not contain valid '
@@ -170,34 +171,32 @@ def __init__(self, config, mpasClimatologyTask,
                         galleryName=galleryName)
 
                     self.add_subtask(subtask)
-        # }}}
-
-    # }}}
 
 
-class ClimatologyMapArgoSalinity(AnalysisTask):  # {{{
+class ClimatologyMapArgoSalinity(AnalysisTask):
     """
     An analysis task for comparison of global salinity against Argo
     observations
     """
+
     # Authors
     # -------
     # Xylar Asay-Davis, Luke Van Roekel
 
     def __init__(self, config, mpasClimatologyTask,
-                 controlConfig=None):  # {{{
+                 controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
             The task that produced the climatology to be remapped and plotted
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -217,20 +216,20 @@ def __init__(self, config, mpasClimatologyTask,
         iselValues = None
 
         # read in what seasons we want to plot
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         if len(seasons) == 0:
             raise ValueError('config section {} does not contain valid list '
                              'of seasons'.format(sectionName))
 
-        comparisonGridNames = config.getExpression(sectionName,
+        comparisonGridNames = config.getexpression(sectionName,
                                                    'comparisonGrids')
 
         if len(comparisonGridNames) == 0:
             raise ValueError('config section {} does not contain valid list '
                              'of comparison grids'.format(sectionName))
 
-        depths = config.getExpression(sectionName, 'depths')
+        depths = config.getexpression(sectionName, 'depths')
 
         if len(depths) == 0:
             raise ValueError('config section {} does not contain valid '
@@ -310,16 +309,13 @@ def __init__(self, config, mpasClimatologyTask,
                         galleryName=galleryName)
 
                     self.add_subtask(subtask)
-        # }}}
-
-    # }}}
 
 
 class RemapArgoClimatology(RemapObservedClimatologySubtask):
-    # {{{
     """
     A subtask for reading and remapping SOSE fields to the comparison grid
     """
+
     # Authors
     # -------
     # Xylar Asay-Davis, Luke Van Roekel
@@ -328,8 +324,8 @@ def __init__(self, parentTask, seasons, fileName, outFilePrefix,
                  fieldName, depths,
                  comparisonGridNames=['latlon'],
                  subtaskName='remapObservations'):
-        # {{{
-        '''
+
+        """
         Construct one analysis subtask for each plot (i.e. each season and
         comparison grid) and a subtask for computing climatologies.
 
@@ -361,7 +357,7 @@ def __init__(self, parentTask, seasons, fileName, outFilePrefix,
 
         subtaskName : str, optional
             The name of the subtask
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis, Luke Van Roekel
@@ -374,10 +370,9 @@ def __init__(self, parentTask, seasons, fileName, outFilePrefix,
         super(RemapArgoClimatology, self).__init__(
             parentTask, seasons, fileName, outFilePrefix,
             comparisonGridNames, subtaskName)
-        # }}}
 
-    def get_observation_descriptor(self, fileName):  # {{{
-        '''
+    def get_observation_descriptor(self, fileName):
+        """
         get a MeshDescriptor for the observation grid
 
         Parameters
@@ -389,7 +384,7 @@ def get_observation_descriptor(self, fileName):  # {{{
         -------
         obsDescriptor : ``MeshDescriptor``
             The descriptor for the observation grid
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis, Luke Van Roekel
@@ -403,10 +398,10 @@ def get_observation_descriptor(self, fileName):  # {{{
                                                   latVarName='latCoord',
                                                   lonVarName='lonCoord')
         dsObs.close()
-        return obsDescriptor  # }}}
+        return obsDescriptor
 
-    def build_observational_dataset(self, fileName):  # {{{
-        '''
+    def build_observational_dataset(self, fileName):
+        """
         read in the data sets for observations, and possibly rename some
         variables and dimensions
 
@@ -419,7 +414,7 @@ def build_observational_dataset(self, fileName):  # {{{
         -------
         dsObs : ``xarray.Dataset``
             The observational dataset
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis, Luke Van Roekel
@@ -455,8 +450,4 @@ def build_observational_dataset(self, fileName):  # {{{
         dsObs = xr.Dataset(data_vars={self.fieldName: field},
                            coords={'depthSlice': depthNames})
 
-        return dsObs  # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return dsObs
diff --git a/mpas_analysis/ocean/climatology_map_bgc.py b/mpas_analysis/ocean/climatology_map_bgc.py
index ce4841333..e7b389f16 100644
--- a/mpas_analysis/ocean/climatology_map_bgc.py
+++ b/mpas_analysis/ocean/climatology_map_bgc.py
@@ -5,9 +5,6 @@
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at http://mpas-dev.github.com/license.html
 #
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 
 from pyremap import LatLonGridDescriptor
@@ -25,7 +22,7 @@
 from mpas_analysis.shared.interpolation.utility import add_periodic_lon
 
 
-class ClimatologyMapBGC(AnalysisTask):  # {{{
+class ClimatologyMapBGC(AnalysisTask):
     """
     An analysis task for plotting of BGC variables
 
@@ -35,19 +32,19 @@ class ClimatologyMapBGC(AnalysisTask):  # {{{
 
     """
 
-    def __init__(self, config, mpasClimatologyTask, controlConfig=None):  # {{{
+    def __init__(self, config, mpasClimatologyTask, controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
             The task that produced the climatology to be remapped and plotted
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
 
         Authors
@@ -56,7 +53,7 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):  # {{{
         """
         # call the constructor from the base class (AnalysisTask)
 
-        bgcVars = config.getExpression('climatologyMapBGC', 'variables')
+        bgcVars = config.getexpression('climatologyMapBGC', 'variables')
 
         super(ClimatologyMapBGC, self).__init__(
             config=config, taskName='climatologyMapBGC',
@@ -66,13 +63,13 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):  # {{{
         sectionName = 'climatologyMapBGC'
 
         # read in what seasons we want to plot
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         if len(seasons) == 0:
             raise ValueError('config section {} does not contain valid list '
                              'of seasons'.format(sectionName))
 
-        comparisonGridNames = config.getExpression(sectionName,
+        comparisonGridNames = config.getexpression(sectionName,
                                                    'comparisonGrids')
 
         if len(comparisonGridNames) == 0:
@@ -209,10 +206,10 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):  # {{{
 
                     self.add_subtask(subtask)
 
-    def setup_and_check(self):  # {{{
-        '''
+    def setup_and_check(self):
+        """
         Check if preindustrial flag is turned on or off.
-        '''
+        """
         # Authors
         # -------
         # Riley X. Brady
@@ -234,11 +231,8 @@ def setup_and_check(self):  # {{{
                   'True' under the ClimatologyMapBGC config section.
                   """)
 
-        # }}}
-    # }}}
 
-
-class RemapBGCClimatology(RemapMpasClimatologySubtask):  # {{{
+class RemapBGCClimatology(RemapMpasClimatologySubtask):
     """
     Apply unit conversions to native model output to align with observations.
     """
@@ -246,7 +240,7 @@ class RemapBGCClimatology(RemapMpasClimatologySubtask):  # {{{
     # -------
     # Riley X. Brady
 
-    def customize_masked_climatology(self, climatology, season):  # {{{
+    def customize_masked_climatology(self, climatology, season):
         """
         Sum over all phytoplankton chlorophyll to create total chlorophyll
 
@@ -281,10 +275,10 @@ def customize_masked_climatology(self, climatology, season):  # {{{
                                    'timeMonthly_avg_ecosysTracers_diazChl',
                                    'timeMonthly_avg_ecosysTracers_phaeoChl'])
 
-        return climatology  # }}}
+        return climatology
 
     def customize_remapped_climatology(self, climatology, comparisonGridName,
-                                       season):  # {{{
+                                       season):
         """
         Convert CO2 gas flux from native units to mol/m2/yr,
         Convert dissolved O2 from native units to mL/L
@@ -320,12 +314,10 @@ def customize_remapped_climatology(self, climatology, comparisonGridName,
         elif fieldName == 'timeMonthly_avg_ecosysTracers_O2':
             conversion = 22.391 / 10**3
             climatology[fieldName] = conversion * climatology[fieldName]
-        return climatology  # }}}
-
-    # }}}
+        return climatology
 
 
-class RemapObservedBGCClimatology(RemapObservedClimatologySubtask):  # {{{
+class RemapObservedBGCClimatology(RemapObservedClimatologySubtask):
     """
     A subtask for reading and remapping BGC observations
     """
@@ -333,8 +325,8 @@ class RemapObservedBGCClimatology(RemapObservedClimatologySubtask):  # {{{
     # -------
     # Riley X. Brady
 
-    def get_observation_descriptor(self, fileName):  # {{{
-        '''
+    def get_observation_descriptor(self, fileName):
+        """
         get a MeshDescriptor for the observation grid
 
         Parameters
@@ -346,7 +338,7 @@ def get_observation_descriptor(self, fileName):  # {{{
         -------
         obsDescriptor : ``MeshDescriptor``
             The descriptor for the observation grid
-        '''
+        """
         # Authors
         # -------
         # Riley X. Brady, Xylar Asay-Davis
@@ -357,10 +349,10 @@ def get_observation_descriptor(self, fileName):  # {{{
         obsDescriptor = LatLonGridDescriptor.read(ds=dsObs,
                                                   latVarName='lat',
                                                   lonVarName='lon')
-        return obsDescriptor  # }}}
+        return obsDescriptor
 
-    def build_observational_dataset(self, fileName):  # {{{
-        '''
+    def build_observational_dataset(self, fileName):
+        """
         read in the data sets for observations, and possibly rename some
         variables and dimensions
 
@@ -373,7 +365,7 @@ def build_observational_dataset(self, fileName):  # {{{
         ------
         dsObs : ``xarray.Dataset``
             The observational dataset
-        '''
+        """
         # Authors
         # -------
         # Riley X. Brady, Xylar Asay-Davis
@@ -381,8 +373,4 @@ def build_observational_dataset(self, fileName):  # {{{
         dsObs = xr.open_dataset(fileName)
         degrees = 'degree' in dsObs.lon.units
         dsObs = add_periodic_lon(ds=dsObs, lonDim='lon', degrees=degrees)
-        return dsObs  # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return dsObs
diff --git a/mpas_analysis/ocean/climatology_map_eke.py b/mpas_analysis/ocean/climatology_map_eke.py
index b4826c76b..7de202aaa 100644
--- a/mpas_analysis/ocean/climatology_map_eke.py
+++ b/mpas_analysis/ocean/climatology_map_eke.py
@@ -1,16 +1,13 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 from pyremap import LatLonGridDescriptor
 
@@ -25,7 +22,7 @@
     PlotClimatologyMapSubtask
 
 
-class ClimatologyMapEKE(AnalysisTask):  # {{{
+class ClimatologyMapEKE(AnalysisTask):
     """
     An analysis task for comparison of eddy kinetic energy (eke) against
     observations
@@ -35,19 +32,19 @@ class ClimatologyMapEKE(AnalysisTask):  # {{{
     # Kevin Rosa
 
     def __init__(self, config, mpasClimatologyTask,
-                 controlConfig=None):  # {{{
+                 controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
             The task that produced the climatology to be remapped and plotted
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -67,7 +64,7 @@ def __init__(self, config, mpasClimatologyTask,
         sectionName = self.taskName
 
         # read in what seasons we want to plot
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         # EKE observations are annual climatology so only accept annual
         # climatology **should move this to setup_and_check()
@@ -76,7 +73,7 @@ def __init__(self, config, mpasClimatologyTask,
                              'of seasons. For EKE, may only request annual '
                              'climatology'.format(sectionName))
 
-        comparisonGridNames = config.getExpression(sectionName,
+        comparisonGridNames = config.getexpression(sectionName,
                                                    'comparisonGrids')
 
         if len(comparisonGridNames) == 0:
@@ -154,12 +151,10 @@ def __init__(self, config, mpasClimatologyTask,
                     galleryName=galleryName)
 
                 self.add_subtask(subtask)
-        # }}}
-    # }}}
 
 
 # adds to the functionality of RemapDepthSlicesSubtask
-class RemapMpasEKEClimatology(RemapMpasClimatologySubtask):  # {{{
+class RemapMpasEKEClimatology(RemapMpasClimatologySubtask):
     """
     A subtask for computing climatologies of eddy kinetic energy from means of
     velocity and velocity-squared.
@@ -168,7 +163,7 @@ class RemapMpasEKEClimatology(RemapMpasClimatologySubtask):  # {{{
     # -------
     # Kevin Rosa
 
-    def customize_masked_climatology(self, climatology, season):  # {{{
+    def customize_masked_climatology(self, climatology, season):
         """
         Construct velocity magnitude as part of the climatology
 
@@ -214,12 +209,10 @@ def customize_masked_climatology(self, climatology, season):  # {{{
         climatology.eke.attrs['units'] = 'cm$^[2]$ s$^{-2}$'
         climatology.eke.attrs['description'] = 'eddy kinetic energy'
 
-        return climatology  # }}}
-
-    # }}}
+        return climatology
 
 
-class RemapObservedEKEClimatology(RemapObservedClimatologySubtask):  # {{{
+class RemapObservedEKEClimatology(RemapObservedClimatologySubtask):
     """
     A subtask for reading and remapping EKE observations
     """
@@ -227,8 +220,8 @@ class RemapObservedEKEClimatology(RemapObservedClimatologySubtask):  # {{{
     # -------
     # Kevin Rosa
 
-    def get_observation_descriptor(self, fileName):  # {{{
-        '''
+    def get_observation_descriptor(self, fileName):
+        """
         get a MeshDescriptor for the observation grid
 
         Parameters
@@ -240,7 +233,7 @@ def get_observation_descriptor(self, fileName):  # {{{
         -------
         obsDescriptor : ``MeshDescriptor``
             The descriptor for the observation grid
-        '''
+        """
         # Authors
         # -------
         # Kevin Rosa
@@ -251,10 +244,10 @@ def get_observation_descriptor(self, fileName):  # {{{
                                                   latVarName='Lat',
                                                   lonVarName='Lon')
 
-        return obsDescriptor  # }}}
+        return obsDescriptor
 
-    def build_observational_dataset(self, fileName):  # {{{
-        '''
+    def build_observational_dataset(self, fileName):
+        """
         read in the data sets for observations, and possibly rename some
         variables and dimensions
 
@@ -267,7 +260,7 @@ def build_observational_dataset(self, fileName):  # {{{
         -------
         dsObs : ``xarray.Dataset``
             The observational dataset
-        '''
+        """
         # Authors
         # -------
         # Kevin Rosa, Xylar Asay-Davis
@@ -287,8 +280,4 @@ def build_observational_dataset(self, fileName):  # {{{
         dsObs.eke.attrs['units'] = 'cm$^2$ s$^{-2}$'
         dsObs.eke.attrs['long_name'] = 'Eddy kinetic energy'
 
-        return dsObs  # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return dsObs
diff --git a/mpas_analysis/ocean/climatology_map_mld.py b/mpas_analysis/ocean/climatology_map_mld.py
index c1b7e89f3..c590311b4 100644
--- a/mpas_analysis/ocean/climatology_map_mld.py
+++ b/mpas_analysis/ocean/climatology_map_mld.py
@@ -1,16 +1,13 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 import numpy as np
 from pyremap import LatLonGridDescriptor
@@ -26,7 +23,7 @@
     PlotClimatologyMapSubtask
 
 
-class ClimatologyMapMLD(AnalysisTask):  # {{{
+class ClimatologyMapMLD(AnalysisTask):
     """
     An analysis task for comparison of mixed layer depth (mld) against
     observations
@@ -36,19 +33,19 @@ class ClimatologyMapMLD(AnalysisTask):  # {{{
     # Luke Van Roekel, Xylar Asay-Davis, Milena Veneziani
 
     def __init__(self, config, mpasClimatologyTask,
-                 controlConfig=None):  # {{{
+                 controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
             The task that produced the climatology to be remapped and plotted
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -68,13 +65,13 @@ def __init__(self, config, mpasClimatologyTask,
         iselValues = None
 
         # read in what seasons we want to plot
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         if len(seasons) == 0:
             raise ValueError('config section {} does not contain valid list '
                              'of seasons'.format(sectionName))
 
-        comparisonGridNames = config.getExpression(sectionName,
+        comparisonGridNames = config.getexpression(sectionName,
                                                    'comparisonGrids')
 
         if len(comparisonGridNames) == 0:
@@ -145,12 +142,11 @@ def __init__(self, config, mpasClimatologyTask,
                     galleryName=galleryName)
 
                 self.add_subtask(subtask)
-        # }}}
 
-    def setup_and_check(self):  # {{{
-        '''
+    def setup_and_check(self):
+        """
         Check if MLD capability was turned on in the run.
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -166,12 +162,8 @@ def setup_and_check(self):  # {{{
             analysisOptionName='config_am_mixedlayerdepths_enable',
             raiseException=True)
 
-        # }}}
 
-    # }}}
-
-
-class RemapObservedMLDClimatology(RemapObservedClimatologySubtask):  # {{{
+class RemapObservedMLDClimatology(RemapObservedClimatologySubtask):
     """
     A subtask for reading and remapping MLD observations
     """
@@ -179,8 +171,8 @@ class RemapObservedMLDClimatology(RemapObservedClimatologySubtask):  # {{{
     # -------
     # Luke Van Roekel, Xylar Asay-Davis, Milena Veneziani
 
-    def get_observation_descriptor(self, fileName):  # {{{
-        '''
+    def get_observation_descriptor(self, fileName):
+        """
         get a MeshDescriptor for the observation grid
 
         Parameters
@@ -192,7 +184,7 @@ def get_observation_descriptor(self, fileName):  # {{{
         -------
         obsDescriptor : ``MeshDescriptor``
             The descriptor for the observation grid
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -206,10 +198,10 @@ def get_observation_descriptor(self, fileName):  # {{{
                                                   latVarName='lat',
                                                   lonVarName='lon')
         dsObs.close()
-        return obsDescriptor  # }}}
+        return obsDescriptor
 
-    def build_observational_dataset(self, fileName):  # {{{
-        '''
+    def build_observational_dataset(self, fileName):
+        """
         read in the data sets for observations, and possibly rename some
         variables and dimensions
 
@@ -222,7 +214,7 @@ def build_observational_dataset(self, fileName):  # {{{
         -------
         dsObs : ``xarray.Dataset``
             The observational dataset
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -247,8 +239,4 @@ def build_observational_dataset(self, fileName):  # {{{
         dsObs.coords['year'] = ('Time', np.ones(dsObs.dims['Time'], int))
 
         dsObs = dsObs[['mld', 'month']]
-        return dsObs  # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return dsObs
diff --git a/mpas_analysis/ocean/climatology_map_mld_min_max.py b/mpas_analysis/ocean/climatology_map_mld_min_max.py
index cc85ade86..0cdce1816 100644
--- a/mpas_analysis/ocean/climatology_map_mld_min_max.py
+++ b/mpas_analysis/ocean/climatology_map_mld_min_max.py
@@ -1,16 +1,13 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 from mpas_analysis.shared import AnalysisTask
 
 from mpas_analysis.shared.climatology import RemapMpasClimatologySubtask
@@ -19,7 +16,7 @@
     PlotClimatologyMapSubtask
 
 
-class ClimatologyMapMLDMinMax(AnalysisTask):  # {{{
+class ClimatologyMapMLDMinMax(AnalysisTask):
     """
     An analysis task for comparison of mixed layer depth (mld) against
     observations
@@ -29,20 +26,20 @@ class ClimatologyMapMLDMinMax(AnalysisTask):  # {{{
     # Luke Van Roekel, Xylar Asay-Davis, Milena Veneziani
 
     def __init__(self, config, mpasClimatologyTasks, controlConfig=None):
-        # {{{
+
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTasks : dict of ``MpasClimatologyTask``
             The tasks that produced the climatology of monthly min and max to
             be remapped and plotted
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -72,12 +69,11 @@ def __init__(self, config, mpasClimatologyTasks, controlConfig=None):
                         mpasVariableSuffix='boundaryLayerDepth',
                         filePrefix='bld',
                         sectionPrefix='climatologyMapBLD')
-        # }}}
 
-    def setup_and_check(self):  # {{{
-        '''
+    def setup_and_check(self):
+        """
         Check if MLD capability was turned on in the run.
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -100,23 +96,21 @@ def setup_and_check(self):  # {{{
             analysisOptionName='config_AM_timeSeriesStatsMonthlyMax_enable',
             raiseException=True)
 
-        # }}}
-
     def _add_tasks(self, config, mpasClimatologyTasks, controlConfig,
                    title, mpasVariableSuffix, filePrefix, sectionPrefix):
-        '''
+        """
         Add tasks for a given variable
-        '''
+        """
         iselValues = None
 
         # read in what seasons we want to plot
-        seasons = config.getExpression(self.taskName, 'seasons')
+        seasons = config.getexpression(self.taskName, 'seasons')
 
         if len(seasons) == 0:
             raise ValueError('config section {} does not contain valid list '
                              'of seasons'.format(self.taskName))
 
-        comparisonGridNames = config.getExpression(self.taskName,
+        comparisonGridNames = config.getexpression(self.taskName,
                                                    'comparisonGrids')
 
         if len(comparisonGridNames) == 0:
@@ -223,7 +217,3 @@ def _add_tasks(self, config, mpasClimatologyTasks, controlConfig,
                             configSectionName=sectionName)
 
                         self.add_subtask(subtask)
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/ocean/climatology_map_ohc_anomaly.py b/mpas_analysis/ocean/climatology_map_ohc_anomaly.py
index f1d86cd1c..967b2cefb 100644
--- a/mpas_analysis/ocean/climatology_map_ohc_anomaly.py
+++ b/mpas_analysis/ocean/climatology_map_ohc_anomaly.py
@@ -1,16 +1,13 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray
 import numpy
 
@@ -24,7 +21,7 @@
 from mpas_analysis.ocean.utility import compute_zmid
 
 
-class ClimatologyMapOHCAnomaly(AnalysisTask):  # {{{
+class ClimatologyMapOHCAnomaly(AnalysisTask):
     """
     An analysis task for comparison of the anomaly from a reference year
     (typically the start of the simulation) of ocean heat content (OHC)
@@ -43,13 +40,13 @@ class ClimatologyMapOHCAnomaly(AnalysisTask):  # {{{
     # Xylar Asay-Davis
 
     def __init__(self, config, mpasClimatologyTask, refYearClimatolgyTask,
-                 controlConfig=None):  # {{{
+                 controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
@@ -59,7 +56,7 @@ def __init__(self, config, mpasClimatologyTask, refYearClimatolgyTask,
             The task that produced the climatology from the first year to be
             remapped and then subtracted from the main climatology
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -79,13 +76,13 @@ def __init__(self, config, mpasClimatologyTask, refYearClimatolgyTask,
         mpasFieldName = 'deltaOHC'
 
         # read in what seasons we want to plot
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         if len(seasons) == 0:
             raise ValueError('config section {} does not contain valid list '
                              'of seasons'.format(sectionName))
 
-        comparisonGridNames = config.getExpression(sectionName,
+        comparisonGridNames = config.getexpression(sectionName,
                                                    'comparisonGrids')
 
         if len(comparisonGridNames) == 0:
@@ -95,9 +92,9 @@ def __init__(self, config, mpasClimatologyTask, refYearClimatolgyTask,
         variableList = ['timeMonthly_avg_activeTracers_temperature',
                         'timeMonthly_avg_layerThickness']
 
-        depthRanges = config.getExpression('climatologyMapOHCAnomaly',
+        depthRanges = config.getexpression('climatologyMapOHCAnomaly',
                                            'depthRanges',
-                                           usenumpyfunc=True)
+                                           use_numpyfunc=True)
 
         self.mpasClimatologyTask = mpasClimatologyTask
         self.refYearClimatolgyTask = refYearClimatolgyTask
@@ -159,17 +156,16 @@ def __init__(self, config, mpasClimatologyTask, refYearClimatolgyTask,
                         galleryName=None)
 
                     self.add_subtask(subtask)
-        # }}}
 
-    def setup_and_check(self):  # {{{
-        '''
+    def setup_and_check(self):
+        """
         Checks whether analysis is being performed only on the reference year,
         in which case the analysis will not be meaningful.
 
         Raises
         ------
         ValueError: if attempting to analyze only the reference year
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -189,11 +185,8 @@ def setup_and_check(self):  # {{{
             raise ValueError('OHC Anomaly is not meaningful and will not work '
                              'when climatology and ref year are the same.')
 
-        # }}}
-    # }}}
-
 
-class RemapMpasOHCClimatology(RemapMpasClimatologySubtask):  # {{{
+class RemapMpasOHCClimatology(RemapMpasClimatologySubtask):
     """
     A subtask for computing climatologies of ocean heat content from
     climatologies of temperature
@@ -210,8 +203,8 @@ class RemapMpasOHCClimatology(RemapMpasClimatologySubtask):  # {{{
     def __init__(self, mpasClimatologyTask, refYearClimatolgyTask, parentTask,
                  climatologyName, variableList, seasons, comparisonGridNames,
                  minDepth, maxDepth):
-        # {{{
-        '''
+
+        """
         Construct the analysis task and adds it as a subtask of the
         ``parentTask``.
 
@@ -248,7 +241,7 @@ def __init__(self, mpasClimatologyTask, refYearClimatolgyTask, parentTask,
         minDepth, maxDepth : float
             The minimum and maximum depths for integration
 
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -266,10 +259,9 @@ def __init__(self, mpasClimatologyTask, refYearClimatolgyTask, parentTask,
         self.run_after(refYearClimatolgyTask)
         self.minDepth = minDepth
         self.maxDepth = maxDepth
-        # }}}
 
-    def setup_and_check(self):  # {{{
-        '''
+    def setup_and_check(self):
+        """
         Perform steps to set up the analysis and check for errors in the setup.
 
         Raises
@@ -278,7 +270,7 @@ def setup_and_check(self):  # {{{
             If a restart file is not available from which to read mesh
             information or if no history files are available from which to
             compute the climatology in the desired time range.
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -293,9 +285,7 @@ def setup_and_check(self):  # {{{
         self.refYearClimatolgyTask.add_variables(self.variableList,
                                                  self.seasons)
 
-        # }}}
-
-    def customize_masked_climatology(self, climatology, season):  # {{{
+    def customize_masked_climatology(self, climatology, season):
         """
         Mask the melt rates using ``landIceMask`` and rescale it to m/yr
 
@@ -331,9 +321,9 @@ def customize_masked_climatology(self, climatology, season):  # {{{
 
         climatology = climatology.drop_vars(self.variableList)
 
-        return climatology  # }}}
+        return climatology
 
-    def _compute_ohc(self, climatology):  # {{{
+    def _compute_ohc(self, climatology):
         """
         Compute the OHC from the temperature and layer thicknesses in a given
         climatology data sets.
@@ -368,9 +358,4 @@ def _compute_ohc(self, climatology):  # {{{
 
         ohc = unitsScalefactor * rho * cp * layerThickness * temperature
         ohc = ohc.sum(dim='nVertLevels')
-        return ohc  # }}}
-
-    # }}}
-
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return ohc
diff --git a/mpas_analysis/ocean/climatology_map_schmidtko.py b/mpas_analysis/ocean/climatology_map_schmidtko.py
index a091f8a15..093e3cbab 100644
--- a/mpas_analysis/ocean/climatology_map_schmidtko.py
+++ b/mpas_analysis/ocean/climatology_map_schmidtko.py
@@ -1,17 +1,17 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-'''
+"""
 Analysis tasks for comparing climatology maps of Antarctic seafloor fields
 against observations from Schmidtko et al. (2014, DOI: 10.1126/science.1256117)
-'''
+"""
 # Authors
 # -------
 # Xylar Asay-Davis
@@ -32,7 +32,7 @@
 from mpas_analysis.shared.projection import get_pyproj_projection
 
 
-class ClimatologyMapSchmidtko(AnalysisTask):  # {{{
+class ClimatologyMapSchmidtko(AnalysisTask):
     """
     An analysis task for comparison of Antarctic Bottom Water properties
     against Schmidtko et al. (2014) observations
@@ -41,19 +41,19 @@ class ClimatologyMapSchmidtko(AnalysisTask):  # {{{
     # -------
     # Xylar Asay-Davis
 
-    def __init__(self, config, mpasClimatologyTask, controlConfig=None):  # {{{
+    def __init__(self, config, mpasClimatologyTask, controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
             The task that produced the climatology to be remapped and plotted
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -88,13 +88,13 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):  # {{{
         sectionName = self.taskName
 
         # read in what seasons we want to plot
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         if len(seasons) == 0:
             raise ValueError('config section {} does not contain valid list '
                              'of seasons'.format(sectionName))
 
-        comparisonGridNames = config.getExpression(sectionName,
+        comparisonGridNames = config.getexpression(sectionName,
                                                    'comparisonGrids')
 
         if len(comparisonGridNames) == 0:
@@ -183,12 +183,9 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):  # {{{
                             upperFieldPrefix))
 
                     self.add_subtask(subtask)
-        # }}}
 
-    # }}}
 
-
-class RemapSchmidtko(RemapObservedClimatologySubtask):  # {{{
+class RemapSchmidtko(RemapObservedClimatologySubtask):
     """
     A subtask for reading and remapping Schmidtko et al. (2014) observations
     """
@@ -199,8 +196,8 @@ class RemapSchmidtko(RemapObservedClimatologySubtask):  # {{{
     def __init__(self, parentTask, seasons, fileName, outFilePrefix,
                  fieldName, comparisonGridNames=['latlon'],
                  subtaskName='remapObservations'):
-        # {{{
-        '''
+
+        """
         Construct one analysis subtask for each plot (i.e. each season and
         comparison grid) and a subtask for computing climatologies.
 
@@ -228,7 +225,7 @@ def __init__(self, parentTask, seasons, fileName, outFilePrefix,
 
         subtaskName : str, optional
             The name of the subtask
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -240,10 +237,9 @@ def __init__(self, parentTask, seasons, fileName, outFilePrefix,
         super(RemapSchmidtko, self).__init__(
             parentTask, seasons, fileName, outFilePrefix,
             comparisonGridNames, subtaskName)
-        # }}}
 
-    def get_observation_descriptor(self, fileName):  # {{{
-        '''
+    def get_observation_descriptor(self, fileName):
+        """
         get a MeshDescriptor for the observation grid
 
         Parameters
@@ -255,7 +251,7 @@ def get_observation_descriptor(self, fileName):  # {{{
         -------
         obsDescriptor : ``MeshDescriptor``
             The descriptor for the observation grid
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -265,10 +261,10 @@ def get_observation_descriptor(self, fileName):  # {{{
         projection = get_pyproj_projection(comparison_grid_name='antarctic')
         obsDescriptor = ProjectionGridDescriptor.read(
             projection, fileName=fileName, xVarName='x', yVarName='y')
-        return obsDescriptor  # }}}
+        return obsDescriptor
 
-    def build_observational_dataset(self, fileName):  # {{{
-        '''
+    def build_observational_dataset(self, fileName):
+        """
         read in the data sets for observations, and possibly rename some
         variables and dimensions
 
@@ -281,7 +277,7 @@ def build_observational_dataset(self, fileName):  # {{{
         -------
         dsObs : ``xarray.Dataset``
             The observational dataset
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -294,8 +290,4 @@ def build_observational_dataset(self, fileName):  # {{{
         dsObs = xr.Dataset(data_vars={self.fieldName: field},
                            coords={'depthSlice': ['bot']})
 
-        return dsObs  # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return dsObs
diff --git a/mpas_analysis/ocean/climatology_map_sose.py b/mpas_analysis/ocean/climatology_map_sose.py
index 73f22fa6c..785ee544f 100644
--- a/mpas_analysis/ocean/climatology_map_sose.py
+++ b/mpas_analysis/ocean/climatology_map_sose.py
@@ -1,17 +1,17 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-'''
+"""
 Analysis tasks for comparing Antarctic climatology maps against observations
 and reanalysis data.
-'''
+"""
 # Authors
 # -------
 # Xylar Asay-Davis
@@ -31,7 +31,7 @@
 from mpas_analysis.shared.io.utility import build_obs_path
 
 
-class ClimatologyMapSose(AnalysisTask):  # {{{
+class ClimatologyMapSose(AnalysisTask):
     """
     An analysis task for comparison of antarctic field against the Southern
     Ocean State Estimate
@@ -41,19 +41,19 @@ class ClimatologyMapSose(AnalysisTask):  # {{{
     # Xylar Asay-Davis
 
     def __init__(self, config, mpasClimatologyTask,
-                 controlConfig=None):  # {{{
+                 controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
             The task that produced the climatology to be remapped and plotted
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -133,17 +133,17 @@ def __init__(self, config, mpasClimatologyTask,
         if fileSuffix.endswith('.nc'):
             fileSuffix = fileSuffix.strip('.nc')
 
-        fieldList = config.getExpression(sectionName, 'fieldList')
+        fieldList = config.getexpression(sectionName, 'fieldList')
         fields = [field for field in fields if field['prefix'] in fieldList]
 
         # read in what seasons we want to plot
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         if len(seasons) == 0:
             raise ValueError('config section {} does not contain valid '
                              'list of seasons'.format(sectionName))
 
-        comparisonGridNames = config.getExpression(sectionName,
+        comparisonGridNames = config.getexpression(sectionName,
                                                    'comparisonGrids')
 
         if len(comparisonGridNames) == 0:
@@ -154,7 +154,7 @@ def __init__(self, config, mpasClimatologyTask,
         if not numpy.any([field['3D'] for field in fields]):
             depths = None
         else:
-            depths = config.getExpression(sectionName, 'depths')
+            depths = config.getexpression(sectionName, 'depths')
 
             if len(depths) == 0:
                 raise ValueError('config section {} does not contain valid '
@@ -298,12 +298,9 @@ def __init__(self, config, mpasClimatologyTask,
                             configSectionName=configSectionName)
 
                         self.add_subtask(subtask)
-        # }}}
 
-    # }}}
 
-
-class RemapMpasVelMagClimatology(RemapDepthSlicesSubtask):  # {{{
+class RemapMpasVelMagClimatology(RemapDepthSlicesSubtask):
     """
     A subtask for computing climatologies of velocity magnitude from zonal
     and meridional components
@@ -312,7 +309,7 @@ class RemapMpasVelMagClimatology(RemapDepthSlicesSubtask):  # {{{
     # -------
     # Xylar Asay-Davis
 
-    def customize_masked_climatology(self, climatology, season):  # {{{
+    def customize_masked_climatology(self, climatology, season):
         """
         Construct velocity magnitude as part of the climatology
 
@@ -347,8 +344,4 @@ def customize_masked_climatology(self, climatology, season):  # {{{
             climatology.velMag.attrs['units'] = 'm s$^{-1}$'
             climatology.velMag.attrs['description'] = 'velocity magnitude'
 
-        return climatology  # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return climatology
diff --git a/mpas_analysis/ocean/climatology_map_ssh.py b/mpas_analysis/ocean/climatology_map_ssh.py
index 297ba2d7f..fcf8c4815 100644
--- a/mpas_analysis/ocean/climatology_map_ssh.py
+++ b/mpas_analysis/ocean/climatology_map_ssh.py
@@ -1,16 +1,13 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 from pyremap import LatLonGridDescriptor
 
@@ -27,7 +24,7 @@
 from mpas_analysis.shared.constants import constants
 
 
-class ClimatologyMapSSH(AnalysisTask):  # {{{
+class ClimatologyMapSSH(AnalysisTask):
     """
     An analysis task for comparison of sea surface height (ssh) against
     observations
@@ -37,19 +34,19 @@ class ClimatologyMapSSH(AnalysisTask):  # {{{
     # Xylar Asay-Davis
 
     def __init__(self, config, mpasClimatologyTask,
-                 controlConfig=None):  # {{{
+                 controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
             The task that produced the climatology to be remapped and plotted
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -70,13 +67,13 @@ def __init__(self, config, mpasClimatologyTask,
         sectionName = self.taskName
 
         # read in what seasons we want to plot
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         if len(seasons) == 0:
             raise ValueError('config section {} does not contain valid list '
                              'of seasons'.format(sectionName))
 
-        comparisonGridNames = config.getExpression(sectionName,
+        comparisonGridNames = config.getexpression(sectionName,
                                                    'comparisonGrids')
 
         if len(comparisonGridNames) == 0:
@@ -149,11 +146,9 @@ def __init__(self, config, mpasClimatologyTask,
                     galleryName=galleryName)
 
                 self.add_subtask(subtask)
-        # }}}
-    # }}}
 
 
-class RemapSSHClimatology(RemapMpasClimatologySubtask):  # {{{
+class RemapSSHClimatology(RemapMpasClimatologySubtask):
     """
     Change units from m to cm
     """
@@ -161,7 +156,7 @@ class RemapSSHClimatology(RemapMpasClimatologySubtask):  # {{{
     # -------
     # Xylar Asay-Davis
 
-    def customize_masked_climatology(self, climatology, season):  # {{{
+    def customize_masked_climatology(self, climatology, season):
         """
         Mask the melt rates using ``landIceMask`` and rescale it to m/yr
 
@@ -188,12 +183,10 @@ def customize_masked_climatology(self, climatology, season):  # {{{
         # scale the field to cm from m
         climatology[fieldName] = constants.cm_per_m * climatology[fieldName]
 
-        return climatology  # }}}
-
-    # }}}
+        return climatology
 
 
-class RemapObservedSSHClimatology(RemapObservedClimatologySubtask):  # {{{
+class RemapObservedSSHClimatology(RemapObservedClimatologySubtask):
     """
     A subtask for reading and remapping SSH observations
     """
@@ -201,8 +194,8 @@ class RemapObservedSSHClimatology(RemapObservedClimatologySubtask):  # {{{
     # -------
     # Xylar Asay-Davis
 
-    def get_observation_descriptor(self, fileName):  # {{{
-        '''
+    def get_observation_descriptor(self, fileName):
+        """
         get a MeshDescriptor for the observation grid
 
         Parameters
@@ -214,7 +207,7 @@ def get_observation_descriptor(self, fileName):  # {{{
         -------
         obsDescriptor : ``MeshDescriptor``
             The descriptor for the observation grid
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -224,10 +217,10 @@ def get_observation_descriptor(self, fileName):  # {{{
         obsDescriptor = LatLonGridDescriptor.read(fileName=fileName,
                                                   latVarName='lat',
                                                   lonVarName='lon')
-        return obsDescriptor  # }}}
+        return obsDescriptor
 
-    def build_observational_dataset(self, fileName):  # {{{
-        '''
+    def build_observational_dataset(self, fileName):
+        """
         read in the data sets for observations, and possibly rename some
         variables and dimensions
 
@@ -240,7 +233,7 @@ def build_observational_dataset(self, fileName):  # {{{
         -------
         dsObs : ``xarray.Dataset``
             The observational dataset
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -254,8 +247,4 @@ def build_observational_dataset(self, fileName):  # {{{
         # scale the field to cm from m
         dsObs['zos'] = constants.cm_per_m * dsObs['zos']
 
-        return dsObs  # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return dsObs
diff --git a/mpas_analysis/ocean/climatology_map_sss.py b/mpas_analysis/ocean/climatology_map_sss.py
index 29aa9076f..4ad1718e1 100644
--- a/mpas_analysis/ocean/climatology_map_sss.py
+++ b/mpas_analysis/ocean/climatology_map_sss.py
@@ -1,16 +1,13 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 import datetime
 from pyremap import LatLonGridDescriptor
@@ -26,7 +23,7 @@
     PlotClimatologyMapSubtask
 
 
-class ClimatologyMapSSS(AnalysisTask):  # {{{
+class ClimatologyMapSSS(AnalysisTask):
     """
     An analysis task for comparison of sea surface salinity (sss) against
     observations
@@ -36,19 +33,19 @@ class ClimatologyMapSSS(AnalysisTask):  # {{{
     # Luke Van Roekel, Xylar Asay-Davis, Milena Veneziani
 
     def __init__(self, config, mpasClimatologyTask,
-                 controlConfig=None):  # {{{
+                 controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
             The task that produced the climatology to be remapped and plotted
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -68,13 +65,13 @@ def __init__(self, config, mpasClimatologyTask,
         sectionName = self.taskName
 
         # read in what seasons we want to plot
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         if len(seasons) == 0:
             raise ValueError('config section {} does not contain valid list '
                              'of seasons'.format(sectionName))
 
-        comparisonGridNames = config.getExpression(sectionName,
+        comparisonGridNames = config.getexpression(sectionName,
                                                    'comparisonGrids')
 
         if len(comparisonGridNames) == 0:
@@ -146,11 +143,9 @@ def __init__(self, config, mpasClimatologyTask,
                     galleryName=galleryName)
 
                 self.add_subtask(subtask)
-        # }}}
-    # }}}
 
 
-class RemapObservedSSSClimatology(RemapObservedClimatologySubtask):  # {{{
+class RemapObservedSSSClimatology(RemapObservedClimatologySubtask):
     """
     A subtask for reading and remapping SSS observations
     """
@@ -158,8 +153,8 @@ class RemapObservedSSSClimatology(RemapObservedClimatologySubtask):  # {{{
     # -------
     # Luke Van Roekel, Xylar Asay-Davis, Milena Veneziani
 
-    def get_observation_descriptor(self, fileName):  # {{{
-        '''
+    def get_observation_descriptor(self, fileName):
+        """
         get a MeshDescriptor for the observation grid
 
         Parameters
@@ -171,7 +166,7 @@ def get_observation_descriptor(self, fileName):  # {{{
         -------
         obsDescriptor : ``MeshDescriptor``
             The descriptor for the observation grid
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -181,10 +176,10 @@ def get_observation_descriptor(self, fileName):  # {{{
         obsDescriptor = LatLonGridDescriptor.read(fileName=fileName,
                                                   latVarName='lat',
                                                   lonVarName='lon')
-        return obsDescriptor  # }}}
+        return obsDescriptor
 
-    def build_observational_dataset(self, fileName):  # {{{
-        '''
+    def build_observational_dataset(self, fileName):
+        """
         read in the data sets for observations, and possibly rename some
         variables and dimensions
 
@@ -197,7 +192,7 @@ def build_observational_dataset(self, fileName):  # {{{
         -------
         dsObs : ``xarray.Dataset``
             The observational dataset
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -211,8 +206,4 @@ def build_observational_dataset(self, fileName):  # {{{
         dsObs.coords['month'] = dsObs['Time.month']
         dsObs.coords['year'] = dsObs['Time.year']
 
-        return dsObs  # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return dsObs
diff --git a/mpas_analysis/ocean/climatology_map_sst.py b/mpas_analysis/ocean/climatology_map_sst.py
index 2f4e4793d..b2c2d23be 100644
--- a/mpas_analysis/ocean/climatology_map_sst.py
+++ b/mpas_analysis/ocean/climatology_map_sst.py
@@ -1,16 +1,13 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 import datetime
 
@@ -27,7 +24,7 @@
     PlotClimatologyMapSubtask
 
 
-class ClimatologyMapSST(AnalysisTask):  # {{{
+class ClimatologyMapSST(AnalysisTask):
     """
     An analysis task for comparison of sea surface temperature (sst) against
     observations
@@ -37,19 +34,19 @@ class ClimatologyMapSST(AnalysisTask):  # {{{
     # Luke Van Roekel, Xylar Asay-Davis, Milena Veneziani
 
     def __init__(self, config, mpasClimatologyTask,
-                 controlConfig=None):  # {{{
+                 controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
             The task that produced the climatology to be remapped and plotted
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -72,13 +69,13 @@ def __init__(self, config, mpasClimatologyTask,
         climEndYear = config.getint(sectionName, 'obsEndYear')
 
         # read in what seasons we want to plot
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         if len(seasons) == 0:
             raise ValueError('config section {} does not contain valid list '
                              'of seasons'.format(sectionName))
 
-        comparisonGridNames = config.getExpression(sectionName,
+        comparisonGridNames = config.getexpression(sectionName,
                                                    'comparisonGrids')
 
         if len(comparisonGridNames) == 0:
@@ -155,11 +152,9 @@ def __init__(self, config, mpasClimatologyTask,
                     galleryName=galleryName)
 
                 self.add_subtask(subtask)
-        # }}}
-    # }}}
 
 
-class RemapObservedSSTClimatology(RemapObservedClimatologySubtask):  # {{{
+class RemapObservedSSTClimatology(RemapObservedClimatologySubtask):
     """
     A subtask for reading and remapping SST observations
     """
@@ -167,8 +162,8 @@ class RemapObservedSSTClimatology(RemapObservedClimatologySubtask):  # {{{
     # -------
     # Luke Van Roekel, Xylar Asay-Davis, Milena Veneziani
 
-    def get_observation_descriptor(self, fileName):  # {{{
-        '''
+    def get_observation_descriptor(self, fileName):
+        """
         get a MeshDescriptor for the observation grid
 
         Parameters
@@ -180,7 +175,7 @@ def get_observation_descriptor(self, fileName):  # {{{
         -------
         obsDescriptor : ``MeshDescriptor``
             The descriptor for the observation grid
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -190,10 +185,10 @@ def get_observation_descriptor(self, fileName):  # {{{
         obsDescriptor = LatLonGridDescriptor.read(fileName=fileName,
                                                   latVarName='lat',
                                                   lonVarName='lon')
-        return obsDescriptor  # }}}
+        return obsDescriptor
 
-    def build_observational_dataset(self, fileName):  # {{{
-        '''
+    def build_observational_dataset(self, fileName):
+        """
         read in the data sets for observations, and possibly rename some
         variables and dimensions
 
@@ -206,7 +201,7 @@ def build_observational_dataset(self, fileName):  # {{{
         -------
         dsObs : ``xarray.Dataset``
             The observational dataset
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -223,8 +218,4 @@ def build_observational_dataset(self, fileName):  # {{{
         dsObs.coords['month'] = dsObs['Time.month']
         dsObs.coords['year'] = dsObs['Time.year']
 
-        return dsObs  # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return dsObs
diff --git a/mpas_analysis/ocean/climatology_map_woa.py b/mpas_analysis/ocean/climatology_map_woa.py
index 2bfbd4880..8efc0ace2 100644
--- a/mpas_analysis/ocean/climatology_map_woa.py
+++ b/mpas_analysis/ocean/climatology_map_woa.py
@@ -1,17 +1,17 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-'''
+"""
 Analysis tasks for comparing Polar (and global) climatology maps against
 WOA18 climatological data.
-'''
+"""
 # Authors
 # -------
 # Milena Veneziani
@@ -32,7 +32,7 @@
 from mpas_analysis.shared.climatology import RemapObservedClimatologySubtask
 
 
-class ClimatologyMapWoa(AnalysisTask):  # {{{
+class ClimatologyMapWoa(AnalysisTask):
     """
     An analysis task for comparison of polar and global temperature and
     salinity against WOA18 climatology fields
@@ -42,19 +42,19 @@ class ClimatologyMapWoa(AnalysisTask):  # {{{
     # Milena Veneziani
 
     def __init__(self, config, mpasClimatologyTask,
-                 controlConfig=None):  # {{{
+                 controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
             The task that produced the climatology to be remapped and plotted
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -84,24 +84,24 @@ def __init__(self, config, mpasClimatologyTask,
 
         sectionName = self.taskName
 
-        fieldList = config.getExpression(sectionName, 'fieldList')
+        fieldList = config.getexpression(sectionName, 'fieldList')
         fields = [field for field in fields if field['prefix'] in fieldList]
 
         # read in what seasons we want to plot
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         if len(seasons) == 0:
             raise ValueError('config section {} does not contain valid list '
                              'of seasons'.format(sectionName))
 
-        comparisonGridNames = config.getExpression(sectionName,
+        comparisonGridNames = config.getexpression(sectionName,
                                                    'comparisonGrids')
 
         if len(comparisonGridNames) == 0:
             raise ValueError('config section {} does not contain valid list '
                              'of comparison grids'.format(sectionName))
 
-        depths = config.getExpression(sectionName, 'depths')
+        depths = config.getexpression(sectionName, 'depths')
 
         if len(depths) == 0:
             raise ValueError('config section {} does not contain valid '
@@ -254,13 +254,10 @@ def __init__(self, config, mpasClimatologyTask,
                             configSectionName=configSectionName)
 
                         self.add_subtask(subtask)
-        # }}}
-
-    # }}}
 
 
 class RemapWoaClimatology(RemapObservedClimatologySubtask):
-    # {{{
+
     """
     A subtask for reading and remapping WOA fields to the comparison grid
     """
@@ -272,8 +269,8 @@ def __init__(self, parentTask, seasons, fileName, outFilePrefix,
                  fieldNames, depths,
                  comparisonGridNames=['latlon'],
                  subtaskName='remapObservations'):
-        # {{{
-        '''
+
+        """
         An analysis task for remapping WOA fields (either annual or monthly
         mean) to the comparison grid(s), depths and seasons provided
 
@@ -306,7 +303,7 @@ def __init__(self, parentTask, seasons, fileName, outFilePrefix,
 
         subtaskName : str, optional
             The name of the subtask
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis, Milena Veneziani
@@ -319,10 +316,9 @@ def __init__(self, parentTask, seasons, fileName, outFilePrefix,
         super(RemapWoaClimatology, self).__init__(
             parentTask, seasons, fileName, outFilePrefix,
             comparisonGridNames, subtaskName)
-        # }}}
 
-    def get_observation_descriptor(self, fileName):  # {{{
-        '''
+    def get_observation_descriptor(self, fileName):
+        """
         get a MeshDescriptor for the observation grid
 
         Parameters
@@ -334,7 +330,7 @@ def get_observation_descriptor(self, fileName):  # {{{
         -------
         obsDescriptor : ``MeshDescriptor``
             The descriptor for the observation grid
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis, Milena Veneziani
@@ -348,10 +344,10 @@ def get_observation_descriptor(self, fileName):  # {{{
                                                   latVarName='lat',
                                                   lonVarName='lon')
         dsObs.close()
-        return obsDescriptor  # }}}
+        return obsDescriptor
 
-    def build_observational_dataset(self, fileName):  # {{{
-        '''
+    def build_observational_dataset(self, fileName):
+        """
         read in the data sets for observations, and possibly rename some
         variables and dimensions
 
@@ -364,7 +360,7 @@ def build_observational_dataset(self, fileName):  # {{{
         -------
         dsObs : ``xarray.Dataset``
             The observational dataset
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis, Milena Veneziani
@@ -398,8 +394,4 @@ def build_observational_dataset(self, fileName):  # {{{
         dsObs = xr.Dataset(data_vars=data_vars,
                            coords={'depthSlice': depthNames})
 
-        return dsObs  # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return dsObs
diff --git a/mpas_analysis/ocean/compute_anomaly_subtask.py b/mpas_analysis/ocean/compute_anomaly_subtask.py
index 5bce1dfba..78b7da8af 100644
--- a/mpas_analysis/ocean/compute_anomaly_subtask.py
+++ b/mpas_analysis/ocean/compute_anomaly_subtask.py
@@ -1,19 +1,16 @@
 # -*- coding: utf-8 -*-
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 #
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import os
 
 from mpas_analysis.shared import AnalysisTask
@@ -66,7 +63,7 @@ class ComputeAnomalySubtask(AnalysisTask):
 
     def __init__(self, parentTask, mpasTimeSeriesTask, outFileName,
                  variableList, movingAveragePoints,
-                 subtaskName='computeAnomaly', alter_dataset=None):  # {{{
+                 subtaskName='computeAnomaly', alter_dataset=None):
         """
         Construct the analysis task.
 
@@ -121,9 +118,7 @@ def __init__(self, parentTask, mpasTimeSeriesTask, outFileName,
 
         self.alter_dataset = alter_dataset
 
-        # }}}
-
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
         """
@@ -155,9 +150,7 @@ def setup_and_check(self):  # {{{
 
         self.inputFile = self.mpasTimeSeriesTask.outputFile
 
-        # }}}
-
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Performs analysis of ocean heat content (OHC) from time-series output.
         """
@@ -199,8 +192,4 @@ def run_task(self):  # {{{
             outFileName = '{}/{}'.format(baseDirectory,
                                          outFileName)
 
-        write_netcdf(ds, outFileName)  # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        write_netcdf(ds, outFileName)
diff --git a/mpas_analysis/ocean/compute_transects_subtask.py b/mpas_analysis/ocean/compute_transects_subtask.py
index 5b0c6fbab..16276f7e4 100644
--- a/mpas_analysis/ocean/compute_transects_subtask.py
+++ b/mpas_analysis/ocean/compute_transects_subtask.py
@@ -1,16 +1,13 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import numpy
 import xarray as xr
 import os
@@ -39,7 +36,7 @@
 from mpas_analysis.shared.interpolation import interp_1d
 
 
-class ComputeTransectsSubtask(RemapMpasClimatologySubtask):  # {{{
+class ComputeTransectsSubtask(RemapMpasClimatologySubtask):
     """
     A subtask for remapping climatologies to transect points
 
@@ -89,7 +86,6 @@ def __init__(self, mpasClimatologyTask, parentTask, climatologyName,
                  verticalComparisonGridName='obs', verticalComparisonGrid=None,
                  subtaskName='remapTransects'):
 
-        # {{{
         """
         Construct the analysis task and adds it as a subtask of the
         ``parentTask``.
@@ -168,9 +164,7 @@ def __init__(self, mpasClimatologyTask, parentTask, climatologyName,
             raise ValueError('If the horizontal comparison grid is "mpas", the '
                              'vertical grid must also be "mpas".')
 
-        # }}}
-
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Creates a PointCollectionDescriptor describing all the points in the
         transects to remap to.  Keeps track of which transects index each point
@@ -226,7 +220,7 @@ def setup_and_check(self):  # {{{
         # (RemapMpasClimatologySubtask)
         super().setup_and_check()
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Compute climatologies of melt rates from E3SM/MPAS output
 
@@ -289,9 +283,7 @@ def run_task(self):  # {{{
 
         dsMesh.close()
 
-        # }}}
-
-    def customize_masked_climatology(self, climatology, season):  # {{{
+    def customize_masked_climatology(self, climatology, season):
         """
         Add zMid to the climatologies
 
@@ -327,10 +319,10 @@ def customize_masked_climatology(self, climatology, season):  # {{{
 
         climatology = climatology.transpose('nVertLevels', 'nCells')
 
-        return climatology  # }}}
+        return climatology
 
     def customize_remapped_climatology(self, climatology, comparisonGridNames,
-                                       season):  # {{{
+                                       season):
         """
         Add the transect index to the data set
 
@@ -367,7 +359,7 @@ def customize_remapped_climatology(self, climatology, comparisonGridNames,
             dims.append('nv')
         climatology = climatology.transpose(*dims)
 
-        return climatology  # }}}
+        return climatology
 
     def _vertical_interp(self, ds, transectIndex, dsObs, outFileName,
                          outObsFileName):
@@ -430,9 +422,9 @@ def _vertical_interp(self, ds, transectIndex, dsObs, outFileName,
             write_netcdf(dsObs, outObsFileName)
 
         ds = ds.drop_vars(['validMask', 'transectNumber'])
-        write_netcdf(ds, outFileName)  # }}}
+        write_netcdf(ds, outFileName)
 
-    def get_mpas_transect_file_name(self, transectName):  # {{{
+    def get_mpas_transect_file_name(self, transectName):
         """Get the file name for a masked MPAS transect info"""
         # Authors
         # -------
@@ -455,9 +447,9 @@ def get_mpas_transect_file_name(self, transectName):  # {{{
 
         fileName = '{}/mpas_transect_info.nc'.format(directory)
 
-        return fileName  # }}}
+        return fileName
 
-    def _compute_mpas_transects(self, dsMesh):  # {{{
+    def _compute_mpas_transects(self, dsMesh):
 
         # see if all transects have already been computed
         allExist = True
@@ -560,9 +552,7 @@ def _compute_mpas_transects(self, dsMesh):  # {{{
                         season, comparisonGridName=transectName)
                     dsOnMpas.to_netcdf(outFileName)
 
-        # }}}
-
-    def _interp_obs_to_mpas(self, da, dsMpasTransect, threshold=0.1):  # {{{
+    def _interp_obs_to_mpas(self, da, dsMpasTransect, threshold=0.1):
         """
         Interpolate observations to the native MPAS transect with masking
         """
@@ -573,19 +563,17 @@ def _interp_obs_to_mpas(self, da, dsMpasTransect, threshold=0.1):  # {{{
         daMask = interp_transect_grid_to_transect_triangle_nodes(
             dsMpasTransect, daMask)
         da = (da / daMask).where(daMask > threshold)
-        return da  # }}}
+        return da
 
-    # }}}
 
-
-class TransectsObservations(object):  # {{{
+class TransectsObservations(object):
     """
     A class for loading and manipulating transect observations
 
     Attributes
     ----------
 
-    config :  ``MpasAnalysisConfigParser``
+    config : mpas_tools.config.MpasConfigParser
         Configuration options
 
     obsFileNames : OrderedDict
@@ -609,13 +597,13 @@ class TransectsObservations(object):  # {{{
     # Xylar Asay-Davis
 
     def __init__(self, config, obsFileNames, horizontalResolution,
-                 transectCollectionName):  # {{{
+                 transectCollectionName):
         """
         Construct the object, setting the observations dictionary to None.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         obsFileNames : OrderedDict
@@ -644,7 +632,7 @@ def __init__(self, config, obsFileNames, horizontalResolution,
         self.transectCollectionName = transectCollectionName
 
     def get_observations(self):
-        # {{{
+
         """
         Read in and set up the observations.
 
@@ -681,9 +669,9 @@ def get_observations(self):
                 write_netcdf(dsObs, outFileName)
             obsDatasets[name] = dsObs
 
-        return obsDatasets  # }}}
+        return obsDatasets
 
-    def build_observational_dataset(self, fileName, transectName):  # {{{
+    def build_observational_dataset(self, fileName, transectName):
         """
         read in the data sets for observations, and possibly rename some
         variables and dimensions
@@ -712,10 +700,10 @@ def build_observational_dataset(self, fileName, transectName):  # {{{
         # and vertical coordinate z.  Override this function if these need to
         # be renamed from the observations file.
 
-        return dsObs  # }}}
+        return dsObs
 
     def get_out_file_name(self, transectName,
-                          verticalComparisonGridName='obs'):  # {{{
+                          verticalComparisonGridName='obs'):
         """
         Given config options, the name of a field and a string identifying the
         months in a seasonal climatology, returns the full path for MPAS
@@ -761,9 +749,9 @@ def get_out_file_name(self, transectName,
             fileName = '{}/{}_{}_{}.nc'.format(
                 remappedDirectory, self.transectCollectionName, transectSuffix,
                 verticalComparisonGridName)
-        return fileName  # }}}
+        return fileName
 
-    def _add_distance(self, dsObs):  # {{{
+    def _add_distance(self, dsObs):
         """
         Add a distance coordinate for the transect.  If a horizontal resolution
         for subdivision is provided, subdivide each segment of the transect so
@@ -798,8 +786,4 @@ def _add_distance(self, dsObs):  # {{{
             dsObs = dsObs.drop_vars(['xIn'])
             dsObs = dsObs.rename({'nPointsOut': 'nPoints', 'xOut': 'x'})
 
-        return dsObs  # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return dsObs
diff --git a/mpas_analysis/ocean/compute_transects_with_vel_mag.py b/mpas_analysis/ocean/compute_transects_with_vel_mag.py
index e1bfc12e6..0662317b5 100644
--- a/mpas_analysis/ocean/compute_transects_with_vel_mag.py
+++ b/mpas_analysis/ocean/compute_transects_with_vel_mag.py
@@ -1,23 +1,20 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import numpy
 
 from mpas_analysis.ocean.compute_transects_subtask import \
     ComputeTransectsSubtask
 
 
-class ComputeTransectsWithVelMag(ComputeTransectsSubtask):  # {{{
+class ComputeTransectsWithVelMag(ComputeTransectsSubtask):
     """
     Add velocity magnitude from zonal and meridional components to observations
     """
@@ -25,7 +22,7 @@ class ComputeTransectsWithVelMag(ComputeTransectsSubtask):  # {{{
     # -------
     # Xylar Asay-Davis
 
-    def customize_masked_climatology(self, climatology, season):  # {{{
+    def customize_masked_climatology(self, climatology, season):
         """
         Construct velocity magnitude as part of the climatology
 
@@ -60,9 +57,4 @@ def customize_masked_climatology(self, climatology, season):  # {{{
             climatology.velMag.attrs['units'] = 'm s$^{-1}$'
             climatology.velMag.attrs['description'] = 'velocity magnitude'
 
-        return climatology  # }}}
-
-    # }}}
-
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return climatology
diff --git a/mpas_analysis/ocean/geojson_transects.py b/mpas_analysis/ocean/geojson_transects.py
index 4ccbbeda9..84666cc27 100644
--- a/mpas_analysis/ocean/geojson_transects.py
+++ b/mpas_analysis/ocean/geojson_transects.py
@@ -1,16 +1,13 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 from collections import OrderedDict
 import json
 import xarray
@@ -23,7 +20,7 @@
 from mpas_analysis.ocean.plot_transect_subtask import PlotTransectSubtask
 
 
-class GeojsonTransects(AnalysisTask):  # {{{
+class GeojsonTransects(AnalysisTask):
     """
     Plot model output at transects defined by lat/lon points in a geojson file
     """
@@ -32,24 +29,22 @@ class GeojsonTransects(AnalysisTask):  # {{{
     # Xylar Asay-Davis
 
     def __init__(self, config, mpasClimatologyTask, controlConfig=None):
-
-        # {{{
-        '''
+        """
         Construct the analysis task and adds it as a subtask of the
         ``parentTask``.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
             The task that produced the climatology to be remapped and plotted
             as a transect
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -64,11 +59,11 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):
 
         sectionName = self.taskName
 
-        geojsonFiles = config.getExpression(sectionName, 'geojsonFiles')
+        geojsonFiles = config.getexpression(sectionName, 'geojsonFiles')
         if len(geojsonFiles) == 0:
             return
 
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         horizontalResolution = config.get(sectionName, 'horizontalResolution')
 
@@ -78,12 +73,12 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):
         if verticalComparisonGridName in ['mpas', 'obs']:
             verticalComparisonGrid = None
         else:
-            verticalComparisonGrid = config.getExpression(
-                sectionName, 'verticalComparisonGrid', usenumpyfunc=True)
+            verticalComparisonGrid = config.getexpression(
+                sectionName, 'verticalComparisonGrid', use_numpyfunc=True)
 
-        verticalBounds = config.getExpression(sectionName, 'verticalBounds')
+        verticalBounds = config.getexpression(sectionName, 'verticalBounds')
 
-        fields = config.getExpression(sectionName, 'fields')
+        fields = config.getexpression(sectionName, 'fields')
 
         obsFileNames = OrderedDict()
         for fileName in geojsonFiles:
@@ -169,12 +164,9 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):
                         verticalBounds=verticalBounds)
 
                     self.add_subtask(subtask)
-        # }}}
 
-    # }}}
 
-
-class GeojsonTransectsObservations(TransectsObservations):  # {{{
+class GeojsonTransectsObservations(TransectsObservations):
     """
     A class for loading and manipulating geojson transects
 
@@ -188,8 +180,8 @@ class GeojsonTransectsObservations(TransectsObservations):  # {{{
     # -------
     # Xylar Asay-Davis
 
-    def build_observational_dataset(self, fileName, transectName):  # {{{
-        '''
+    def build_observational_dataset(self, fileName, transectName):
+        """
         read in the data sets for observations, and possibly rename some
         variables and dimensions
 
@@ -205,7 +197,7 @@ def build_observational_dataset(self, fileName, transectName):  # {{{
         -------
         dsObs : ``xarray.Dataset``
             The observational dataset
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -228,7 +220,4 @@ def build_observational_dataset(self, fileName, transectName):  # {{{
         dsObs['lat'] = (('nPoints',), numpy.array(lat))
         dsObs.lat.attrs['units'] = 'degrees'
 
-        return dsObs  # }}}
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return dsObs
diff --git a/mpas_analysis/ocean/hovmoller_ocean_regions.py b/mpas_analysis/ocean/hovmoller_ocean_regions.py
index 7b92d4d4d..8048fdb3c 100644
--- a/mpas_analysis/ocean/hovmoller_ocean_regions.py
+++ b/mpas_analysis/ocean/hovmoller_ocean_regions.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -31,7 +31,7 @@
     compute_moving_avg_anomaly_from_start
 
 
-class HovmollerOceanRegions(AnalysisTask):  # {{{
+class HovmollerOceanRegions(AnalysisTask):
     """
     Compute and plot a Hovmoller diagram (depth vs. time) for regionally
     analyzed data.  The mean of the data are computed over each region at each
@@ -42,13 +42,13 @@ class HovmollerOceanRegions(AnalysisTask):  # {{{
     # Xylar Asay-Davis
 
     def __init__(self, config, regionMasksTask, oceanRegionalProfilesTask,
-                 controlConfig=None):  # {{{
+                 controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  instance of MpasAnalysisConfigParser
+        config :  mpas_tools.config.MpasConfigParser
             Contains configuration options
 
         regionMasksTask : ``ComputeRegionMasks``
@@ -57,7 +57,7 @@ def __init__(self, config, regionMasksTask, oceanRegionalProfilesTask,
         oceanRegionalProfilesTask : mpas_analysis.ocean.OceanRegionalProfiles
             A task for computing ocean regional profiles
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -80,13 +80,13 @@ def __init__(self, config, regionMasksTask, oceanRegionalProfilesTask,
         else:
             endYear = int(endYear)
 
-        regionGroups = config.getExpression('hovmollerOceanRegions',
+        regionGroups = config.getexpression('hovmollerOceanRegions',
                                             'regionGroups')
 
         for regionGroup in regionGroups:
             suffix = regionGroup[0].upper() + regionGroup[1:].replace(' ', '')
             regionGroupSection = 'hovmoller{}'.format(suffix)
-            regionNames = config.getExpression(regionGroupSection,
+            regionNames = config.getexpression(regionGroupSection,
                                                'regionNames')
             if len(regionNames) == 0:
                 return
@@ -94,7 +94,7 @@ def __init__(self, config, regionMasksTask, oceanRegionalProfilesTask,
             computeAnomaly = config.getboolean(regionGroupSection,
                                                'computeAnomaly')
 
-            fields = config.getExpression(regionGroupSection, 'fields')
+            fields = config.getexpression(regionGroupSection, 'fields')
 
             masksSubtask = regionMasksTask.add_mask_subtask(regionGroup)
             masksFile = masksSubtask.geojsonFileName
@@ -111,8 +111,8 @@ def __init__(self, config, regionMasksTask, oceanRegionalProfilesTask,
             combineSubtask = oceanRegionalProfilesTask.combineSubtasks[
                 regionGroup][(startYear, endYear)]
 
-            movingAverageMonths = config.getint(
-                regionGroupSection, 'movingAverageMonths')
+            movingAveragePoints = config.getint(
+                regionGroupSection, 'movingAveragePoints')
 
             baseDirectory = build_config_full_path(
                 config, 'output', 'timeSeriesSubdirectory')
@@ -130,7 +130,7 @@ def __init__(self, config, regionMasksTask, oceanRegionalProfilesTask,
                         startYear, endYear)
                 outFullPath = '{}/{}'.format(baseDirectory, outFileName)
                 anomalySubtask = ComputeHovmollerAnomalySubtask(
-                    self, inFullPath, outFullPath, movingAverageMonths)
+                    self, inFullPath, outFullPath, movingAveragePoints)
                 self.add_subtask(anomalySubtask)
                 anomalySubtask.run_after(combineSubtask)
                 # PlotHovmollerSubtask requires a relative path
@@ -143,8 +143,8 @@ def __init__(self, config, regionMasksTask, oceanRegionalProfilesTask,
                 suffix = prefix[0].upper() + prefix[1:]
                 fieldSectionName = 'hovmollerOceanRegions{}'.format(suffix)
 
-                config.set(fieldSectionName, 'movingAverageMonths',
-                           '{}'.format(movingAverageMonths))
+                config.set(fieldSectionName, 'movingAveragePoints',
+                           '{}'.format(movingAveragePoints))
 
                 for regionName in regionNames:
                     if computeAnomaly:
@@ -191,8 +191,6 @@ def __init__(self, config, regionMasksTask, oceanRegionalProfilesTask,
                     self.add_subtask(hovmollerSubtask)
 
         self.run_after(oceanRegionalProfilesTask)
-        # }}}
-    # }}}
 
 
 class ComputeHovmollerAnomalySubtask(AnalysisTask):
@@ -217,7 +215,7 @@ class ComputeHovmollerAnomalySubtask(AnalysisTask):
     # Xylar Asay-Davis
 
     def __init__(self, parentTask, inFileName, outFileName,
-                 movingAverageMonths, subtaskName='computeAnomaly'):  # {{{
+                 movingAveragePoints, subtaskName='computeAnomaly'):
         """
         Construct the analysis task.
 
@@ -232,7 +230,7 @@ def __init__(self, parentTask, inFileName, outFileName,
         outFileName : str
             The file name for the anomaly
 
-        movingAverageMonths : int
+        movingAveragePoints : int
             The number of months used in the moving average used to
             smooth the data set
 
@@ -253,11 +251,9 @@ def __init__(self, parentTask, inFileName, outFileName,
 
         self.inFileName = inFileName
         self.outFileName = outFileName
-        self.movingAverageMonths = movingAverageMonths
+        self.movingAveragePoints = movingAveragePoints
 
-        # }}}
-
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
         """
@@ -281,13 +277,11 @@ def setup_and_check(self):  # {{{
 
         months = delta.months + 12*delta.years
 
-        if months <= self.movingAverageMonths:
+        if months <= self.movingAveragePoints:
             raise ValueError('Cannot meaningfully perform a rolling mean '
                              'because the time series is too short.')
 
-        # }}}
-
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Performs analysis of ocean heat content (OHC) from time-series output.
         """
@@ -301,7 +295,7 @@ def run_task(self):  # {{{
 
         ds = xarray.open_dataset(self.inFileName)
 
-        dsStart = ds.isel(Time=slice(0, self.movingAverageMonths)).mean('Time')
+        dsStart = ds.isel(Time=slice(0, self.movingAveragePoints)).mean('Time')
 
         for variable in ds.data_vars:
             ds[variable] = ds[variable] - dsStart[variable]
@@ -314,9 +308,4 @@ def run_task(self):  # {{{
             outFileName = '{}/{}'.format(baseDirectory,
                                          outFileName)
 
-        write_netcdf(ds, outFileName)  # }}}
-
-    # }}}
-
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        write_netcdf(ds, outFileName)
diff --git a/mpas_analysis/ocean/index_nino34.py b/mpas_analysis/ocean/index_nino34.py
index f5d315b5d..9a3aa286f 100644
--- a/mpas_analysis/ocean/index_nino34.py
+++ b/mpas_analysis/ocean/index_nino34.py
@@ -1,19 +1,16 @@
 # -*- coding: utf-8 -*-
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 #
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import datetime
 import xarray as xr
 import pandas as pd
@@ -41,8 +38,8 @@
 from mpas_analysis.shared.html import write_image_xml
 
 
-class IndexNino34(AnalysisTask):  # {{{
-    '''
+class IndexNino34(AnalysisTask):
+    """
     A task for computing and plotting time series and spectra of the El Nino
     3.4 climate index
 
@@ -52,29 +49,29 @@ class IndexNino34(AnalysisTask):  # {{{
     mpasTimeSeriesTask : ``MpasTimeSeriesTask``
         The task that extracts the time series from MPAS monthly output
 
-    controlConfig :  ``MpasAnalysisConfigParser``
+    controlconfig : mpas_tools.config.MpasConfigParser
         Configuration options for a control run (if any)
-    '''
+    """
     # Authors
     # -------
     # Luke Van Roekel, Xylar Asay-Davis
 
     def __init__(self, config, mpasTimeSeriesTask, controlConfig=None):
-        # {{{
-        '''
+
+        """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasTimeSeriesTask : ``MpasTimeSeriesTask``
             The task that extracts the time series from MPAS monthly output
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -91,12 +88,10 @@ def __init__(self, config, mpasTimeSeriesTask, controlConfig=None):
 
         self.run_after(mpasTimeSeriesTask)
 
-        # }}}
-
-    def setup_and_check(self):  # {{{
-        '''
+    def setup_and_check(self):
+        """
         Perform steps to set up the analysis and check for errors in the setup.
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -144,13 +139,11 @@ def setup_and_check(self):  # {{{
             self.xmlFileNames.append('{}/{}.xml'.format(self.plotsDirectory,
                                                         filePrefix))
 
-        # }}}
-
-    def run_task(self):  # {{{
-        '''
+    def run_task(self):
+        """
         Computes NINO34 index and plots the time series and power spectrum with
         95 and 99% confidence bounds
-        '''
+        """
         # Authors
         # -------
         # Luke Van Roekel, Xylar Asay-Davis
@@ -199,7 +192,7 @@ def run_task(self):  # {{{
 
         # regionIndex should correspond to NINO34 in surface weighted Average
         # AM
-        regions = config.getExpression('regions', 'regions')
+        regions = config.getexpression('regions', 'regions')
         regionToPlot = config.get('indexNino34', 'region')
         regionIndex = regions.index(regionToPlot)
 
@@ -317,9 +310,7 @@ def run_task(self):  # {{{
                         plotType='Spectra',
                         ninoIndexNumber=ninoIndexNumber)
 
-    # }}}
-
-    def _compute_nino34_index(self, regionSST, calendar):  # {{{
+    def _compute_nino34_index(self, regionSST, calendar):
         """
         Computes nino34 index time series.  It follow the standard nino34
         algorithm, i.e.,
@@ -368,9 +359,9 @@ def _compute_nino34_index(self, regionSST, calendar):  # {{{
 
         # Compute 5 month running mean
         wgts = np.ones(5) / 5.
-        return self._running_mean(anomaly, wgts)  # }}}
+        return self._running_mean(anomaly, wgts)
 
-    def _compute_nino34_spectra(self, nino34Index):  # {{{
+    def _compute_nino34_spectra(self, nino34Index):
         """
         Computes power spectra of Nino34 index.
 
@@ -455,9 +446,8 @@ def _compute_nino34_spectra(self, nino34Index):  # {{{
                    'conf95': mkov * scale * xLow,
                    'redNoise': mkov * scale}
         return spectra
-        # }}}
 
-    def _autocorr(self, x, t=1):  # {{{
+    def _autocorr(self, x, t=1):
         """
         Computes lag one auto-correlation for the NINO34 spectra calculation
 
@@ -475,9 +465,9 @@ def _autocorr(self, x, t=1):  # {{{
         # -------
         # Luke Van Roekel
 
-        return np.corrcoef(np.array([x[0:len(x) - t], x[t:len(x)]]))  # }}}
+        return np.corrcoef(np.array([x[0:len(x) - t], x[t:len(x)]]))
 
-    def _running_mean(self, inputData, wgts):  # {{{
+    def _running_mean(self, inputData, wgts):
         """
         Calculates a generic weighted running mean
 
@@ -502,14 +492,14 @@ def _running_mean(self, inputData, wgts):  # {{{
         for k in range(sp, nt - (sp + 1)):
             runningMean[k] = sum(wgts * inputData[k - sp:k + sp + 1].values)
 
-        return runningMean  # }}}
+        return runningMean
 
     def _nino34_spectra_plot(self, spectra, title, panelTitles,
                              outFileName, lineWidth=2, xlabel='Period (years)',
                              ylabel=r'Power ($^o$C / cycles mo$^{-1}$)',
                              titleFontSize=None, figsize=(9, 21), dpi=None,
                              periodMin=1., periodMax=10.):
-        # {{{
+
         """
         Plots the nino34 time series and power spectra in an image file
         Parameters
@@ -610,13 +600,12 @@ def _nino34_spectra_plot(self, spectra, title, panelTitles,
             savefig(outFileName, config)
 
         plt.close()
-        # }}}
 
     def _nino34_timeseries_plot(self, nino34s, title, panelTitles, outFileName,
                                 xlabel='Time (years)', ylabel=r'($\degree$C)',
                                 titleFontSize=None, figsize=(9, 21), dpi=None,
                                 maxXTicks=20, lineWidth=2):
-        # {{{
+
         """
         Plots the nino34 time series and power spectra in an image file
 
@@ -690,12 +679,11 @@ def _nino34_timeseries_plot(self, nino34s, title, panelTitles, outFileName,
             savefig(outFileName, config)
 
         plt.close()
-        # }}}
 
     def _plot_nino_timeseries(self, ninoIndex, time, xlabel, ylabel,
                               panelTitle, title_font, axis_font,
-                              lineWidth):  # {{{
-        '''
+                              lineWidth):
+        """
         Plot the nino time series on a subplot
 
         Parameters
@@ -717,7 +705,7 @@ def _plot_nino_timeseries(self, ninoIndex, time, xlabel, ylabel,
 
         lineWidth : list of str
             control line width
-        '''
+        """
         # Authors
         # -------
         # Luke Van Roekel, Xylar Asay-Davis
@@ -741,9 +729,8 @@ def _plot_nino_timeseries(self, ninoIndex, time, xlabel, ylabel,
             plt.xlabel(xlabel, **axis_font)
         if ylabel is not None:
             plt.ylabel(ylabel, **axis_font)
-        # }}}
 
-    def _write_xml(self, filePrefix, plotType, ninoIndexNumber):  # {{{
+    def _write_xml(self, filePrefix, plotType, ninoIndexNumber):
         caption = u'{} of El Niño {} Climate Index'.format(plotType,
                                                            ninoIndexNumber)
         write_image_xml(
@@ -755,10 +742,10 @@ def _write_xml(self, filePrefix, plotType, ninoIndexNumber):  # {{{
             groupLink='nino',
             thumbnailDescription=plotType,
             imageDescription=caption,
-            imageCaption=caption)  # }}}
+            imageCaption=caption)
 
     def _plot_size_y_axis(self, x, ys, xmin, xmax):
-        '''
+        """
         Get the maximum y value over the given range of x values
 
         Parameters
@@ -774,7 +761,7 @@ def _plot_size_y_axis(self, x, ys, xmin, xmax):
 
         xmax : float, optional
             The maximum x values
-        '''
+        """
         # Authors
         # -------
         # Luke Van Roekel, Xylar Asay-Davis
@@ -793,5 +780,3 @@ def _plot_size_y_axis(self, x, ys, xmin, xmax):
         return maxY
 
 # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/ocean/meridional_heat_transport.py b/mpas_analysis/ocean/meridional_heat_transport.py
index 9e5e6fec3..0d70e14de 100644
--- a/mpas_analysis/ocean/meridional_heat_transport.py
+++ b/mpas_analysis/ocean/meridional_heat_transport.py
@@ -1,24 +1,20 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 import numpy as np
 import os
 
 from mpas_analysis.shared.plot import plot_vertical_section, plot_1D, savefig
 
-
 from mpas_analysis.shared.io.utility import make_directories, build_obs_path
 from mpas_analysis.shared.io import write_netcdf
 
@@ -28,8 +24,8 @@
     get_climatology_op_directory
 
 
-class MeridionalHeatTransport(AnalysisTask):  # {{{
-    '''
+class MeridionalHeatTransport(AnalysisTask):
+    """
     Plot meridional heat transport from the analysis member output.
 
     Attributes
@@ -38,28 +34,29 @@ class MeridionalHeatTransport(AnalysisTask):  # {{{
     mpasClimatologyTask : ``MpasClimatologyTask``
         The task that produced the climatology to be remapped and plotted
 
-    controlConfig :  ``MpasAnalysisConfigParser``
+    controlconfig : mpas_tools.config.MpasConfigParser
         Configuration options for a control run (if any)
-    '''
+    """
+
     # Authors
     # -------
     # Mark Petersen, Milena Veneziani, Xylar Asay-Davis
 
-    def __init__(self, config, mpasClimatologyTask, controlConfig=None):  # {{{
-        '''
+    def __init__(self, config, mpasClimatologyTask, controlConfig=None):
+        """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
             The task that produced the climatology to be remapped and plotted
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -76,12 +73,10 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):  # {{{
 
         self.controlConfig = controlConfig
 
-        # }}}
-
-    def setup_and_check(self):  # {{{
-        '''
+    def setup_and_check(self):
+        """
         Perform steps to set up the analysis and check for errors in the setup.
-        '''
+        """
         # Authors
         # -------
         # Mark Petersen, Milena Veneziani, Xylar Asay-Davis
@@ -145,9 +140,7 @@ def setup_and_check(self):  # {{{
                                                         filePrefix))
             self.filePrefixes[prefix] = filePrefix
 
-        # }}}
-
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Process MHT analysis member data if available.
         Plots MHT as:
@@ -164,9 +157,9 @@ def run_task(self):  # {{{
 
         mainRunName = config.get('runs', 'mainRunName')
 
-        depthLimGlobal = config.getExpression(self.sectionName,
+        depthLimGlobal = config.getexpression(self.sectionName,
                                               'depthLimGlobal')
-        xLimGlobal = config.getExpression(self.sectionName, 'xLimGlobal')
+        xLimGlobal = config.getexpression(self.sectionName, 'xLimGlobal')
         movingAveragePoints = config.getint('meridionalHeatTransport',
                                             'movingAveragePoints')
 
@@ -310,7 +303,6 @@ def run_task(self):  # {{{
             errArrays.extend([ncepErrGlobal, ecmwfErrGlobal])
 
         if self.controlConfig is not None:
-
             controlStartYear = self.controlConfig.getint('climatology',
                                                          'startYear')
             controlEndYear = self.controlConfig.getint('climatology',
@@ -369,9 +361,7 @@ def run_task(self):  # {{{
 
             self._write_xml(filePrefix)
 
-        # }}}
-
-    def _write_xml(self, filePrefix):  # {{{
+    def _write_xml(self, filePrefix):
         caption = 'Meridional Heat Transport'
         write_image_xml(
             config=self.config,
@@ -381,8 +371,4 @@ def _write_xml(self, filePrefix):  # {{{
             galleryGroup='Meridional Heat Transport',
             groupLink='mht',
             imageDescription=caption,
-            imageCaption=caption)  # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+            imageCaption=caption)
diff --git a/mpas_analysis/ocean/ocean_regional_profiles.py b/mpas_analysis/ocean/ocean_regional_profiles.py
index bd157cd6e..cf5c0d31a 100644
--- a/mpas_analysis/ocean/ocean_regional_profiles.py
+++ b/mpas_analysis/ocean/ocean_regional_profiles.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -29,7 +29,7 @@
 from mpas_analysis.shared.plot import savefig, add_inset
 
 
-class OceanRegionalProfiles(AnalysisTask):  # {{{
+class OceanRegionalProfiles(AnalysisTask):
     """
     Compute and plot vertical profiles of regionally analyzed data.  The
     mean and standard deviation of the data are computed over each region.
@@ -41,19 +41,19 @@ class OceanRegionalProfiles(AnalysisTask):  # {{{
     # -------
     # Xylar Asay-Davis
 
-    def __init__(self, config, regionMasksTask, controlConfig=None):  # {{{
+    def __init__(self, config, regionMasksTask, controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  instance of MpasAnalysisConfigParser
+        config :  mpas_tools.config.MpasConfigParser
             Contains configuration options
 
         regionMasksTask : ``ComputeRegionMasks``
             A task for computing region masks
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -74,18 +74,18 @@ def __init__(self, config, regionMasksTask, controlConfig=None):  # {{{
         startYear = config.getint('climatology', 'startYear')
         endYear = config.getint('climatology', 'endYear')
 
-        regionGroups = config.getExpression('oceanRegionalProfiles',
+        regionGroups = config.getexpression('oceanRegionalProfiles',
                                             'regionGroups')
 
         for regionGroup in regionGroups:
             regionGroupSection = 'profiles{}'.format(
                 regionGroup.replace(' ', ''))
 
-            fields = config.getExpression(regionGroupSection, 'fields')
+            fields = config.getexpression(regionGroupSection, 'fields')
 
-            seasons = config.getExpression(regionGroupSection, 'seasons')
+            seasons = config.getexpression(regionGroupSection, 'seasons')
 
-            regionNames = config.getExpression(regionGroupSection,
+            regionNames = config.getexpression(regionGroupSection,
                                                'regionNames')
             if len(regionNames) == 0:
                 return
@@ -109,8 +109,6 @@ def __init__(self, config, regionMasksTask, controlConfig=None):  # {{{
                         plotSubtask.run_after(combineSubtask)
                         self.add_subtask(plotSubtask)
 
-        # }}}
-
     def add_region_group(self, regionMasksTask, regionGroup, regionNames,
                          fields, startYear, endYear, seasons=None):
         """
@@ -169,10 +167,8 @@ def add_region_group(self, regionMasksTask, regionGroup, regionNames,
                 combineSubtask.run_after(computeSubtask)
                 self.computeSubtasks[regionGroup][key] = computeSubtask
 
-    # }}}
-
 
-class ComputeRegionalProfileTimeSeriesSubtask(AnalysisTask):  # {{{
+class ComputeRegionalProfileTimeSeriesSubtask(AnalysisTask):
     """
     Compute regional statistics on each layer and time point of a set of
     MPAS fields
@@ -190,7 +186,7 @@ class ComputeRegionalProfileTimeSeriesSubtask(AnalysisTask):  # {{{
     # Xylar Asay-Davis
 
     def __init__(self, parentTask, masksSubtask, regionGroup, regionNames,
-                 fields, startYear, endYear):  # {{{
+                 fields, startYear, endYear):
         """
         Construct the analysis task.
 
@@ -235,9 +231,8 @@ def __init__(self, parentTask, masksSubtask, regionGroup, regionNames,
         self.fields = fields
         self.startYear = startYear
         self.endYear = endYear
-        # }}}
 
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
 
@@ -261,9 +256,7 @@ def setup_and_check(self):  # {{{
             analysisOptionName='config_am_timeseriesstatsmonthly_enable',
             raiseException=True)
 
-        # }}}
-
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Compute time series of regional profiles
         """
@@ -427,7 +420,6 @@ def run_task(self):  # {{{
         dsOut['z'].attrs['units'] = 'meters'
 
         write_netcdf(dsOut, outputFileName)
-        # }}}
 
     @staticmethod
     def _masked_area_sum(cellMasks, areaCell, var):
@@ -441,10 +433,8 @@ def _masked_area_sum(cellMasks, areaCell, var):
         total = xr.concat(totals, 'nRegions')
         return total
 
-    # }}}
-
 
-class CombineRegionalProfileTimeSeriesSubtask(AnalysisTask):  # {{{
+class CombineRegionalProfileTimeSeriesSubtask(AnalysisTask):
     """
     Combine individual time series into a single data set
     """
@@ -453,7 +443,7 @@ class CombineRegionalProfileTimeSeriesSubtask(AnalysisTask):  # {{{
     # Xylar Asay-Davis
 
     def __init__(self, parentTask, regionGroup, timeSeriesName, seasons, fields,
-                 startYears, endYears):  # {{{
+                 startYears, endYears):
         """
         Construct the analysis task.
 
@@ -495,9 +485,8 @@ def __init__(self, parentTask, regionGroup, timeSeriesName, seasons, fields,
         self.timeSeriesName = timeSeriesName
         self.seasons = seasons
         self.fields = fields
-        # }}}
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Combine the time series
         """
@@ -580,11 +569,8 @@ def run_task(self):  # {{{
                 dsSeason.coords['regionNames'] = regionNames
                 write_netcdf(dsSeason, outputFileName)
 
-        # }}}
-    # }}}
 
-
-class PlotRegionalProfileTimeSeriesSubtask(AnalysisTask):  # {{{
+class PlotRegionalProfileTimeSeriesSubtask(AnalysisTask):
     """
     Plot a profile averaged over an ocean region and in time, along with
     variability in both space and time.
@@ -603,7 +589,7 @@ class PlotRegionalProfileTimeSeriesSubtask(AnalysisTask):  # {{{
     field : dict
         Information about the field (e.g. temperature) being plotted
 
-    controlConfig :  ``MpasAnalysisConfigParser``
+    controlconfig : mpas_tools.config.MpasConfigParser
         Configuration options for a control run (if any)
     """
     # Authors
@@ -612,7 +598,7 @@ class PlotRegionalProfileTimeSeriesSubtask(AnalysisTask):  # {{{
 
     def __init__(self, parentTask, masksSubtask, season, regionName, field,
                  timeSeriesName, startYear, endYear, controlConfig):
-        # {{{
+
         """
         Construct the analysis task.
 
@@ -640,7 +626,7 @@ def __init__(self, parentTask, masksSubtask, season, regionName, field,
         startYear, endYear : int
             The beginning and end of the time series to compute
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -669,9 +655,8 @@ def __init__(self, parentTask, masksSubtask, season, regionName, field,
         self.field = field
         self.filePrefix = None
         self.xmlFileNames = []
-        # }}}
 
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
         """
@@ -692,9 +677,8 @@ def setup_and_check(self):  # {{{
             self.endYear)
         self.xmlFileNames = ['{}/{}.xml'.format(self.plotsDirectory,
                                                 self.filePrefix)]
-        # }}}
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Plot a depth profile with variability
         """
@@ -799,7 +783,7 @@ def run_task(self):  # {{{
             fieldArrays.append(dsControl[meanFieldName].values)
             errArrays.append(dsControl[stdFieldName].values)
 
-        depthRange = config.getExpression(regionGroupSection, 'depthRange')
+        depthRange = config.getexpression(regionGroupSection, 'depthRange')
         if len(depthRange) == 0:
             depthRange = None
 
@@ -828,11 +812,10 @@ def run_task(self):  # {{{
             imageCaption=caption,
             gallery=titleFieldName,
             thumbnailDescription='{} {}'.format(regionName, self.season))
-        # }}}
 
     def plot(self, zArrays, fieldArrays, errArrays, lineColors, lineWidths,
              legendText, title, xLabel, yLabel, xLim=None, yLim=None,
-             figureSize=(10, 4), dpi=None):  # {{{
+             figureSize=(10, 4), dpi=None):
         """
         Plots a 1D line plot with error bars if available.
 
@@ -931,9 +914,7 @@ def plot(self, zArrays, fieldArrays, errArrays, lineColors, lineWidths,
             plt.xlim(xLim)
         if yLim:
             plt.ylim(yLim)
-        return fig  # }}}
-
-    # }}}
+        return fig
 
 
 def _update_fields(fields, newFields):
@@ -951,5 +932,3 @@ def _update_fields(fields, newFields):
                 break
         if not found:
             fields.append(newFields[outer])
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/ocean/plot_climatology_map_subtask.py b/mpas_analysis/ocean/plot_climatology_map_subtask.py
index 5840bfac8..6b97ac5f6 100644
--- a/mpas_analysis/ocean/plot_climatology_map_subtask.py
+++ b/mpas_analysis/ocean/plot_climatology_map_subtask.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -16,9 +16,6 @@
 # -------
 # Luke Van Roekel, Xylar Asay-Davis, Milena Veneziani
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 import numpy as np
 
@@ -116,7 +113,7 @@ def __init__(self, parentTask, season, comparisonGridName,
                  remapMpasClimatologySubtask, remapObsClimatologySubtask=None,
                  secondRemapMpasClimatologySubtask=None, controlConfig=None,
                  depth=None, removeMean=False, subtaskName=None):
-        '''
+        """
         Construct one analysis subtask for each plot (i.e. each season and
         comparison grid) and a subtask for computing climatologies.
 
@@ -144,7 +141,7 @@ def __init__(self, parentTask, season, comparisonGridName,
             A second subtask for remapping another MPAS climatology to plot
             in the second panel and compare with in the third panel
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
 
         depth : {float, 'top', 'bot'}, optional
@@ -162,7 +159,7 @@ def __init__(self, parentTask, season, comparisonGridName,
             The name of the subtask.  If not specified, it is
             ``plot<season>_<comparisonGridName>`` with a suffix indicating the
             depth being sliced (if any)
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
diff --git a/mpas_analysis/ocean/plot_depth_integrated_time_series_subtask.py b/mpas_analysis/ocean/plot_depth_integrated_time_series_subtask.py
index 6eecf9ad6..1e162696b 100644
--- a/mpas_analysis/ocean/plot_depth_integrated_time_series_subtask.py
+++ b/mpas_analysis/ocean/plot_depth_integrated_time_series_subtask.py
@@ -1,19 +1,16 @@
 # -*- coding: utf-8 -*-
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 #
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import os
 import xarray
 
@@ -85,7 +82,7 @@ class PlotDepthIntegratedTimeSeriesSubtask(AnalysisTask):
     galleryName : str
         The name of the gallery in which this plot belongs
 
-    controlConfig : ``MpasAnalysisConfigParser``
+    controlConfig : mpas_tools.config.MpasConfigParser
         The configuration options for the control run (if any)
     """
     # Authors
@@ -96,7 +93,7 @@ def __init__(self, parentTask, regionName, inFileName, outFileLabel,
                  fieldNameInTitle, mpasFieldName, yAxisLabel, sectionName,
                  thumbnailSuffix, imageCaption, galleryGroup, groupSubtitle,
                  groupLink, galleryName, subtaskName=None, controlConfig=None):
-        # {{{
+
         """
         Construct the analysis task.
 
@@ -151,7 +148,7 @@ def __init__(self, parentTask, regionName, inFileName, outFileLabel,
         subtaskName :  str, optional
             The name of the subtask (``plotTimeSeries<RegionName>`` by default)
 
-        controlConfig : ``MpasAnalysisConfigParser``, optional
+        controlConfig : mpas_tools.config.MpasConfigParser, optional
             The configuration options for the control run (if any)
         """
         # Authors
@@ -188,9 +185,7 @@ def __init__(self, parentTask, regionName, inFileName, outFileLabel,
         self.groupLink = groupLink
         self.galleryName = galleryName
 
-        # }}}
-
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
         """
@@ -250,9 +245,9 @@ def setup_and_check(self):  # {{{
         self.xmlFileNames = ['{}/{}.xml'.format(
             self.plotsDirectory, self.filePrefix)]
 
-        return  # }}}
+        return
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Compute vertical aggregates of the data and plot the time series
         """
@@ -268,8 +263,8 @@ def run_task(self):  # {{{
 
         mainRunName = config.get('runs', 'mainRunName')
 
-        plotTitles = config.getExpression('regions', 'plotTitles')
-        allRegionNames = config.getExpression('regions', 'regions')
+        plotTitles = config.getexpression('regions', 'plotTitles')
+        allRegionNames = config.getexpression('regions', 'regions')
         regionIndex = allRegionNames.index(self.regionName)
         regionNameInTitle = plotTitles[regionIndex]
 
@@ -288,7 +283,7 @@ def run_task(self):  # {{{
 
         depths = ds.depth.values
 
-        divisionDepths = config.getExpression(self.sectionName, 'depths')
+        divisionDepths = config.getexpression(self.sectionName, 'depths')
 
         # for each depth interval to plot, determine the top and bottom depth
         topDepths = [0, 0] + divisionDepths
@@ -495,8 +490,6 @@ def run_task(self):  # {{{
             imageDescription=self.imageCaption,
             imageCaption=self.imageCaption)
 
-        # }}}
-
     def customize_fig(self, fig):
         """
         A function to override to customize the figure.
@@ -505,7 +498,3 @@ def customize_fig(self, fig):
             The figure
         """
         pass
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/ocean/plot_hovmoller_subtask.py b/mpas_analysis/ocean/plot_hovmoller_subtask.py
index 3b7a038b5..fe7122055 100644
--- a/mpas_analysis/ocean/plot_hovmoller_subtask.py
+++ b/mpas_analysis/ocean/plot_hovmoller_subtask.py
@@ -1,19 +1,16 @@
 # -*- coding: utf-8 -*-
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 #
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 import numpy as np
 import os
@@ -37,7 +34,7 @@ class PlotHovmollerSubtask(AnalysisTask):
     Attributes
     ----------
 
-    controlConfig :  ``MpasAnalysisConfigParser``
+    controlconfig : mpas_tools.config.MpasConfigParser
         Configuration options for a control run (if any)
 
     regionName : str
@@ -96,7 +93,7 @@ def __init__(self, parentTask, regionName, inFileName, outFileLabel,
                  fieldNameInTitle, mpasFieldName, unitsLabel, sectionName,
                  thumbnailSuffix, imageCaption, galleryGroup, groupSubtitle,
                  groupLink, galleryName, subtaskName=None,
-                 controlConfig=None, regionMaskFile=None):  # {{{
+                 controlConfig=None, regionMaskFile=None):
         """
         Construct the analysis task.
 
@@ -151,7 +148,7 @@ def __init__(self, parentTask, regionName, inFileName, outFileLabel,
         subtaskName :  str, optional
             The name of the subtask (``plotHovmoller<RegionName>`` by default)
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
 
         regionMaskFile : str, optional
@@ -193,9 +190,7 @@ def __init__(self, parentTask, regionName, inFileName, outFileLabel,
         self.groupLink = groupLink
         self.galleryName = galleryName
 
-        # }}}
-
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
         """
@@ -237,9 +232,9 @@ def setup_and_check(self):  # {{{
         self.xmlFileNames = ['{}/{}.xml'.format(
             self.plotsDirectory, self.filePrefix)]
 
-        return  # }}}
+        return
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Make the Hovmoller plot from the time series.
         """
@@ -264,8 +259,8 @@ def run_task(self):  # {{{
             regionNameInTitle = self.regionName.replace('_', ' ')
             regionDim = ds.regionNames.dims[0]
         else:
-            plotTitles = config.getExpression('regions', 'plotTitles')
-            allRegionNames = config.getExpression('regions', 'regions')
+            plotTitles = config.getexpression('regions', 'plotTitles')
+            allRegionNames = config.getexpression('regions', 'regions')
             regionIndex = allRegionNames.index(self.regionName)
             regionNameInTitle = plotTitles[regionIndex]
             regionDim = 'nOceanRegionsTmp'
@@ -316,11 +311,11 @@ def run_task(self):  # {{{
         else:
             yearStrideXTicks = None
 
-        movingAverageMonths = config.getWithDefault(
-            sectionName, 'movingAverageMonths', 1)
+        movingAveragePoints = config.getint(
+            sectionName, 'movingAveragePoints')
 
         if config.has_option(sectionName, 'yLim'):
-            yLim = config.getExpression(sectionName, 'yLim')
+            yLim = config.getexpression(sectionName, 'yLim')
         else:
             yLim = None
 
@@ -339,9 +334,9 @@ def run_task(self):  # {{{
                 regionNameInTitle = self.regionName.replace('_', ' ')
                 regionDim = dsRef.regionNames.dims[0]
             else:
-                plotTitles = controlConfig.getExpression('regions',
+                plotTitles = controlConfig.getexpression('regions',
                                                          'plotTitles')
-                allRegionNames = controlConfig.getExpression('regions',
+                allRegionNames = controlConfig.getexpression('regions',
                                                              'regions')
                 regionIndex = allRegionNames.index(self.regionName)
                 regionNameInTitle = plotTitles[regionIndex]
@@ -379,7 +374,7 @@ def run_task(self):  # {{{
             zCoord=z, colorbarLabel=self.unitsLabel, title=title,
             modelTitle=mainRunName, refTitle=refTitle, diffTitle=diffTitle,
             xlabels=xLabel, ylabel=yLabel, lineWidth=1, xCoordIsTime=True,
-            movingAveragePoints=movingAverageMonths, calendar=self.calendar,
+            movingAveragePoints=movingAveragePoints, calendar=self.calendar,
             firstYearXTicks=firstYearXTicks, yearStrideXTicks=yearStrideXTicks,
             yLim=yLim, invertYAxis=False, titleFontSize=titleFontSize,
             axisFontSize=axisFontSize, defaultFontSize=defaultFontSize)
@@ -419,9 +414,3 @@ def run_task(self):  # {{{
                 regionNameInTitle, self.thumbnailSuffix),
             imageDescription=self.imageCaption,
             imageCaption=self.imageCaption)
-
-        # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/ocean/plot_transect_subtask.py b/mpas_analysis/ocean/plot_transect_subtask.py
index 61c6f8cfa..90b84eb2b 100644
--- a/mpas_analysis/ocean/plot_transect_subtask.py
+++ b/mpas_analysis/ocean/plot_transect_subtask.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -16,11 +16,10 @@
 # -------
 # Xylar Asay-Davis, Greg Streletz
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 import numpy
+from matplotlib import colors
+from matplotlib import cm
 
 from geometric_features import FeatureCollection
 
@@ -39,7 +38,7 @@
 from mpas_analysis.shared.constants import constants
 
 
-class PlotTransectSubtask(AnalysisTask):  # {{{
+class PlotTransectSubtask(AnalysisTask):
     """
     An analysis task for plotting 2D model fields against observations.
 
@@ -59,7 +58,7 @@ class PlotTransectSubtask(AnalysisTask):  # {{{
     plotObs : bool, optional
         Whether to plot against observations.
 
-    controlConfig :  ``MpasAnalysisConfigParser``
+    controlconfig : mpas_tools.config.MpasConfigParser
         Configuration options for a control run (if any), ignored if
         ``plotObs == True``
 
@@ -109,8 +108,8 @@ class PlotTransectSubtask(AnalysisTask):  # {{{
     def __init__(self, parentTask, season, transectName, fieldName,
                  computeTransectsSubtask, plotObs=True,
                  controlConfig=None, horizontalBounds=None):
-        # {{{
-        '''
+
+        """
         Construct one analysis subtask for each plot (i.e. each season and
         comparison grid) and a subtask for computing climatologies.
 
@@ -136,14 +135,14 @@ def __init__(self, parentTask, season, transectName, fieldName,
         plotObs : bool, optional
             Whether to plot against observations.
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any), ignored if
             ``plotObs == True``
 
         horizontalBounds : [float, float], optional
             The distance in km of the left- and right-hand edges of the plot,
             chosen automatically by default or if the list is empty
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -173,15 +172,14 @@ def __init__(self, parentTask, season, transectName, fieldName,
         # this task should not run until the remapping subtasks are done, since
         # it relies on data from those subtasks
         self.run_after(computeTransectsSubtask)
-        # }}}
 
     def set_plot_info(self, outFileLabel, fieldNameInTitle, mpasFieldName,
                       refFieldName, refTitleLabel, unitsLabel,
                       imageCaption, galleryGroup, groupSubtitle, groupLink,
                       galleryName, configSectionName, verticalBounds,
                       diffTitleLabel='Model - Observations'):
-        # {{{
-        '''
+
+        """
         Store attributes related to plots, plot file names and HTML output.
 
         Parameters
@@ -232,7 +230,7 @@ def set_plot_info(self, outFileLabel, fieldNameInTitle, mpasFieldName,
         diffTitleLabel : str, optional
             the title of the difference subplot
 
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -260,9 +258,8 @@ def set_plot_info(self, outFileLabel, fieldNameInTitle, mpasFieldName,
             self.verticalBounds = None
         else:
             self.verticalBounds = verticalBounds
-        # }}}
 
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
         """
@@ -299,9 +296,8 @@ def setup_and_check(self):  # {{{
 
         self.xmlFileNames.append('{}/{}.xml'.format(self.plotsDirectory,
                                                     self.filePrefix))
-        # }}}
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Plots a comparison of ACME/MPAS output to SST, MLD or SSS observations
         or a control run
@@ -368,10 +364,8 @@ def run_task(self):  # {{{
         if remappedRefClimatology is not None:
             remappedRefClimatology.close()
 
-        # }}}
-
     def _plot_transect(self, remappedModelClimatology, remappedRefClimatology):
-        # {{{
+
         """ plotting the transect """
 
         season = self.season
@@ -523,22 +517,36 @@ def _plot_transect(self, remappedModelClimatology, remappedRefClimatology):
         # what line styles and line colors to use, and whether and how
         # to label contours
 
-        compareAsContours = config.getboolean('transects',
-                                              'compareAsContoursOnSinglePlot')
+        if config.has_option(configSectionName,
+                             'compareAsContoursOnSinglePlot'):
+            compareAsContours = config.getboolean(
+                configSectionName, 'compareAsContoursOnSinglePlot')
+        else:
+            compareAsContours = config.getboolean(
+                'transects', 'compareAsContoursOnSinglePlot')
 
         contourLineStyle = config.get('transects', 'contourLineStyle')
-        contourLineColor = config.get('transects', 'contourLineColor')
         comparisonContourLineStyle = config.get('transects',
                                                 'comparisonContourLineStyle')
-        comparisonContourLineColor = config.get('transects',
-                                                'comparisonContourLineColor')
 
         if compareAsContours:
+            contourLineWidth = \
+                config.getfloat('transects', 'mainContourLineWidth')
+            contourLineColor = None
+            comparisonContourLineColor = None
+            contourColormap = PlotTransectSubtask._get_contour_colormap()
             labelContours = config.getboolean(
                 'transects', 'labelContoursOnContourComparisonPlots')
+            comparisonContourLineWidth = \
+                config.getfloat('transects', 'comparisonContourLineWidth')
         else:
+            contourLineWidth = config.getfloat('transects', 'contourLineWidth')
+            contourLineColor = config.get('transects', 'contourLineColor')
+            comparisonContourLineColor = None
+            contourColormap = None
             labelContours = config.getboolean('transects',
                                               'labelContoursOnHeatmaps')
+            comparisonContourLineWidth = None
 
         contourLabelPrecision = config.getint('transects',
                                               'contourLabelPrecision')
@@ -587,8 +595,11 @@ def _plot_transect(self, remappedModelClimatology, remappedRefClimatology):
             xLim=self.horizontalBounds,
             yLim=self.verticalBounds,
             compareAsContours=compareAsContours,
+            lineWidth=contourLineWidth,
             lineStyle=contourLineStyle,
             lineColor=contourLineColor,
+            contourColormap=contourColormap,
+            comparisonContourLineWidth=comparisonContourLineWidth,
             comparisonContourLineStyle=comparisonContourLineStyle,
             comparisonContourLineColor=comparisonContourLineColor,
             labelContours=labelContours,
@@ -624,7 +635,10 @@ def _plot_transect(self, remappedModelClimatology, remappedRefClimatology):
             ax.spines['left'].set_linewidth(4)
             ax.spines['right'].set_linewidth(4)
 
-        add_inset(fig, fc, width=1.5, height=1.5, xbuffer=0.1, ybuffer=0.1)
+        if compareAsContours:
+            add_inset(fig, fc, width=1., height=1., xbuffer=0.1, ybuffer=0.1)
+        else:
+            add_inset(fig, fc, width=1.5, height=1.5, xbuffer=0.1, ybuffer=0.1)
 
         savefig(outFileName, config, tight=False)
 
@@ -642,10 +656,8 @@ def _plot_transect(self, remappedModelClimatology, remappedRefClimatology):
             imageDescription=caption,
             imageCaption=caption)
 
-        # }}}
-
     def _lat_greater_extent(self, lat, lon):
-        # {{{
+
         """
         Returns True if lat has a greater extent (in degrees) than lon (or the
         same extent as lon), and False otherwise.
@@ -720,10 +732,9 @@ def _lat_greater_extent(self, lat, lon):
             return True
         else:
             return False
-        # }}}
 
     def _strictly_monotonic(self, coord):
-        # {{{
+
         """Whether the coordinate is strictly monotonic"""
         # Authors
         # -------
@@ -734,10 +745,9 @@ def _strictly_monotonic(self, coord):
         coord_diff = numpy.where(coord_diff < -180, coord_diff + 360,
                                  coord_diff)
         return numpy.all(coord_diff > 0) or numpy.all(coord_diff < 0)
-        # }}}
 
     def _lat_most_monotonic(self, lat, lon):
-        # {{{
+
         """
         Returns True if lat is "more monotonic" than lon in terms of the
         difference between the total number of degrees traversed and the net
@@ -759,10 +769,9 @@ def _lat_most_monotonic(self, lat, lon):
             return True
         else:
             return False
-        # }}}
 
     def _lat_most_steps_in_same_direction(self, lat, lon):
-        # {{{
+
         """
         Returns True if lat is has more steps in the same direction (either
         steps that increase the latitude or steps that decrease the latitude)
@@ -794,10 +803,9 @@ def _lat_most_steps_in_same_direction(self, lat, lon):
             return True
         else:
             return False
-        # }}}
 
     def _lat_fewest_direction_changes(self, lat, lon):
-        # {{{
+
         """
         Returns True if lat is has fewer changes in direction (from increasing
         in value to decreasing in value, or vice versa) than lon (or if both
@@ -829,7 +837,6 @@ def _lat_fewest_direction_changes(self, lat, lon):
             return True
         else:
             return False
-        # }}}
 
     def _get_ds_triangulation(self, dsTransectTriangles):
         """get matplotlib Triangulation from triangulation dataset"""
@@ -849,7 +856,12 @@ def _get_ds_triangulation(self, dsTransectTriangles):
 
         return triangulation_args
 
-    # }}}
+    @staticmethod
+    def _get_contour_colormap():
+        # https://stackoverflow.com/a/18926541/7728169
 
+        cmap = cm.get_cmap('hot')
+        cmap = colors.LinearSegmentedColormap.from_list(
+            f'trunc_{cmap.name}', cmap(numpy.linspace(0.1, 0.85, 100)))
 
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return cmap
diff --git a/mpas_analysis/ocean/regional_ts_diagrams.py b/mpas_analysis/ocean/regional_ts_diagrams.py
index 2469499bd..add1dccd8 100644
--- a/mpas_analysis/ocean/regional_ts_diagrams.py
+++ b/mpas_analysis/ocean/regional_ts_diagrams.py
@@ -1,16 +1,13 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import os
 import xarray
 import numpy
@@ -50,7 +47,7 @@
 from mpas_analysis.shared.plot.title import limit_title
 
 
-class RegionalTSDiagrams(AnalysisTask):  # {{{
+class RegionalTSDiagrams(AnalysisTask):
     """
     Create T-S Diagrams of the climatology within a given ocean region
 
@@ -65,13 +62,13 @@ class RegionalTSDiagrams(AnalysisTask):  # {{{
 
     def __init__(self, config, mpasClimatologyTask, regionMasksTask,
                  controlConfig=None):
-        # {{{
+
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
@@ -80,7 +77,7 @@ def __init__(self, config, mpasClimatologyTask, regionMasksTask,
         regionMasksTask : ``ComputeRegionMasks``
             A task for computing region masks
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -97,9 +94,9 @@ def __init__(self, config, mpasClimatologyTask, regionMasksTask,
         self.run_after(mpasClimatologyTask)
         self.mpasClimatologyTask = mpasClimatologyTask
 
-        regionGroups = config.getExpression(self.taskName, 'regionGroups')
+        regionGroups = config.getexpression(self.taskName, 'regionGroups')
 
-        self.seasons = config.getExpression(self.taskName, 'seasons')
+        self.seasons = config.getexpression(self.taskName, 'seasons')
 
         obsDicts = {
             'SOSE': {
@@ -146,7 +143,7 @@ def __init__(self, config, mpasClimatologyTask, regionMasksTask,
             sectionSuffix = regionGroup[0].upper() + \
                 regionGroup[1:].replace(' ', '')
             sectionName = 'TSDiagramsFor{}'.format(sectionSuffix)
-            obsList = config.getExpression(sectionName, 'obs')
+            obsList = config.getexpression(sectionName, 'obs')
             allObsUsed = allObsUsed + obsList
         allObsUsed = set(allObsUsed)
 
@@ -166,7 +163,7 @@ def __init__(self, config, mpasClimatologyTask, regionMasksTask,
                 regionGroup[1:].replace(' ', '')
             sectionName = 'TSDiagramsFor{}'.format(sectionSuffix)
 
-            regionNames = config.getExpression(sectionName, 'regionNames')
+            regionNames = config.getexpression(sectionName, 'regionNames')
             if len(regionNames) == 0:
                 continue
 
@@ -175,7 +172,7 @@ def __init__(self, config, mpasClimatologyTask, regionMasksTask,
 
             regionNames = mpasMasksSubtask.expand_region_names(regionNames)
 
-            obsList = config.getExpression(sectionName, 'obs')
+            obsList = config.getexpression(sectionName, 'obs')
             groupObsDicts = {}
 
             for obsName in obsList:
@@ -222,9 +219,7 @@ def __init__(self, config, mpasClimatologyTask, regionMasksTask,
                     plotRegionSubtask.run_after(computeRegionSubtask)
                     self.add_subtask(plotRegionSubtask)
 
-        # }}}
-
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
         """
@@ -246,7 +241,6 @@ def setup_and_check(self):  # {{{
                         'timeMonthly_avg_layerThickness']
         self.mpasClimatologyTask.add_variables(variableList=variableList,
                                                seasons=self.seasons)
-    # }}}
 
 
 class ComputeObsTSClimatology(AnalysisTask):
@@ -265,7 +259,7 @@ class ComputeObsTSClimatology(AnalysisTask):
     # -------
     # Xylar Asay-Davis
 
-    def __init__(self, parentTask, obsName, obsDict, season):  # {{{
+    def __init__(self, parentTask, obsName, obsDict, season):
         """
         Construct the analysis task.
 
@@ -306,9 +300,7 @@ def __init__(self, parentTask, obsName, obsDict, season):  # {{{
             multiprocessing.cpu_count(),
             self.config.getint(self.taskName, 'daskThreads'))
 
-        # }}}
-
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Plots time-series output of properties in an ocean region.
         """
@@ -442,7 +434,6 @@ def run_task(self):  # {{{
                 self.logger.info('  Deleting temp file {}'.format(file_name))
                 os.remove(file_name)
             self.logger.info('  Done!')
-        # }}}
 
     def _get_file_name(self, obsDict, suffix=''):
         obsSection = '{}Observations'.format(self.componentName)
@@ -458,8 +449,6 @@ def _get_file_name(self, obsDict, suffix=''):
             obsDict['gridName'], self.season, suffix)
         return fileName
 
-    # }}}
-
 
 class ComputeRegionTSSubtask(AnalysisTask):
     """
@@ -476,7 +465,7 @@ class ComputeRegionTSSubtask(AnalysisTask):
     sectionName : str
         The section of the config file to get options from
 
-    controlConfig : ``MpasAnalysisConfigParser``
+    controlConfig : mpas_tools.config.MpasConfigParser
         The configuration options for the control run (if any)
 
     mpasClimatologyTask : ``MpasClimatologyTask``
@@ -499,7 +488,7 @@ class ComputeRegionTSSubtask(AnalysisTask):
     def __init__(self, parentTask, regionGroup, regionName, controlConfig,
                  sectionName, fullSuffix, mpasClimatologyTask,
                  mpasMasksSubtask, obsDicts, season):
-        # {{{
+
         """
         Construct the analysis task.
 
@@ -515,7 +504,7 @@ def __init__(self, parentTask, regionGroup, regionName, controlConfig,
         regionName : str
             Name of the region to plot
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
 
         sectionName : str
@@ -568,9 +557,8 @@ def __init__(self, parentTask, regionGroup, regionName, controlConfig,
         self.daskThreads = min(
             multiprocessing.cpu_count(),
             self.config.getint(self.taskName, 'daskThreads'))
-        # }}}
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Plots time-series output of properties in an ocean region.
         """
@@ -585,7 +573,7 @@ def run_task(self):  # {{{
         for obsName in self.obsDicts:
             self._write_obs_t_s(self.obsDicts[obsName], zmin, zmax)
 
-    def _write_mpas_t_s(self, config):  # {{{
+    def _write_mpas_t_s(self, config):
 
         climatologyName = 'TS_{}_{}'.format(self.prefix, self.season)
         outFileName = get_masked_mpas_climatology_file_name(
@@ -700,9 +688,9 @@ def _write_mpas_t_s(self, config):  # {{{
             dsOut['zbounds'] = ('nBounds', [zmin, zmax])
             write_netcdf(dsOut, outFileName)
 
-        return zmin, zmax  # }}}
+        return zmin, zmax
 
-    def _write_obs_t_s(self, obsDict, zmin, zmax):  # {{{
+    def _write_obs_t_s(self, obsDict, zmin, zmax):
         obsSection = '{}Observations'.format(self.componentName)
         climatologyDirectory = build_config_full_path(
             config=self.config, section='output',
@@ -788,10 +776,6 @@ def _write_obs_t_s(self, obsDict, zmin, zmax):  # {{{
             dsOut['zbounds'] = ('nBounds', [zmin, zmax])
             write_netcdf(dsOut, outFileName)
 
-        # }}}
-
-    # }}}
-
 
 class PlotRegionTSDiagramSubtask(AnalysisTask):
     """
@@ -808,7 +792,7 @@ class PlotRegionTSDiagramSubtask(AnalysisTask):
     sectionName : str
         The section of the config file to get options from
 
-    controlConfig : ``MpasAnalysisConfigParser``
+    controlConfig : mpas_tools.config.MpasConfigParser
         The configuration options for the control run (if any)
 
     mpasClimatologyTask : ``MpasClimatologyTask``
@@ -831,7 +815,7 @@ class PlotRegionTSDiagramSubtask(AnalysisTask):
     def __init__(self, parentTask, regionGroup, regionName, controlConfig,
                  sectionName, fullSuffix, mpasClimatologyTask,
                  mpasMasksSubtask, obsDicts, season):
-        # {{{
+
         """
         Construct the analysis task.
 
@@ -847,7 +831,7 @@ def __init__(self, parentTask, regionGroup, regionName, controlConfig,
         regionName : str
             Name of the region to plot
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
 
         sectionName : str
@@ -900,9 +884,8 @@ def __init__(self, parentTask, regionGroup, regionName, controlConfig,
         self.daskThreads = min(
             multiprocessing.cpu_count(),
             self.config.getint(self.taskName, 'daskThreads'))
-        # }}}
 
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
 
@@ -923,9 +906,9 @@ def setup_and_check(self):  # {{{
 
         self.xmlFileNames = ['{}/TS_diagram_{}_{}.xml'.format(
             self.plotsDirectory, self.prefix, self.season)]
-        return  # }}}
+        return
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Plots time-series output of properties in an ocean region.
         """
@@ -1024,8 +1007,8 @@ def run_task(self):  # {{{
             plotFields.append({'S': obsS, 'T': obsT, 'z': obsZ, 'vol': obsVol,
                                'title': obsName})
 
-        Tbins = config.getExpression(sectionName, 'Tbins', usenumpyfunc=True)
-        Sbins = config.getExpression(sectionName, 'Sbins', usenumpyfunc=True)
+        Tbins = config.getexpression(sectionName, 'Tbins', use_numpyfunc=True)
+        Sbins = config.getexpression(sectionName, 'Sbins', use_numpyfunc=True)
 
         normType = config.get(sectionName, 'normType')
 
@@ -1182,9 +1165,7 @@ def run_task(self):  # {{{
             imageDescription=caption,
             imageCaption=caption)
 
-        # }}}
-
-    def _get_mpas_t_s(self, config):  # {{{
+    def _get_mpas_t_s(self, config):
         climatologyName = 'TS_{}_{}'.format(self.prefix, self.season)
         inFileName = get_masked_mpas_climatology_file_name(
             config, self.season, self.componentName, climatologyName, op='avg')
@@ -1196,9 +1177,9 @@ def _get_mpas_t_s(self, config):  # {{{
         volume = ds.volume.values
         zmin, zmax = ds.zbounds.values
 
-        return T, S, z, volume, zmin, zmax  # }}}
+        return T, S, z, volume, zmin, zmax
 
-    def _get_obs_t_s(self, obsDict):  # {{{
+    def _get_obs_t_s(self, obsDict):
 
         obsSection = '{}Observations'.format(self.componentName)
         climatologyDirectory = build_config_full_path(
@@ -1215,17 +1196,17 @@ def _get_obs_t_s(self, obsDict):  # {{{
         z = ds.z.values
         volume = ds.volume.values
 
-        return T, S, z, volume  # }}}
+        return T, S, z, volume
 
-    def _plot_volumetric_panel(self, T, S, volume):  # {{{
+    def _plot_volumetric_panel(self, T, S, volume):
 
         config = self.config
         sectionName = self.sectionName
         cmap = config.get(sectionName, 'colorMap')
-        Tbins = config.getExpression(sectionName, 'Tbins',
-                                     usenumpyfunc=True)
-        Sbins = config.getExpression(sectionName, 'Sbins',
-                                     usenumpyfunc=True)
+        Tbins = config.getexpression(sectionName, 'Tbins',
+                                     use_numpyfunc=True)
+        Sbins = config.getexpression(sectionName, 'Sbins',
+                                     use_numpyfunc=True)
 
         hist, _, _, panel = plt.hist2d(S, T, bins=[Sbins, Tbins],
                                        weights=volume, cmap=cmap, zorder=1,
@@ -1238,9 +1219,9 @@ def _plot_volumetric_panel(self, T, S, volume):  # {{{
         else:
             volMin = None
             volMax = None
-        return panel, volMin, volMax  # }}}
+        return panel, volMin, volMax
 
-    def _plot_scatter_panel(self, T, S, z, zmin, zmax):  # {{{
+    def _plot_scatter_panel(self, T, S, z, zmin, zmax):
 
         config = self.config
         sectionName = self.sectionName
@@ -1251,8 +1232,4 @@ def _plot_scatter_panel(self, T, S, z, zmin, zmax):  # {{{
         panel = plt.scatter(S[indices], T[indices], c=z[indices],
                             s=5, vmin=zmin, vmax=zmax, cmap=cmap, zorder=1)
 
-        return panel  # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return panel
diff --git a/mpas_analysis/ocean/remap_depth_slices_subtask.py b/mpas_analysis/ocean/remap_depth_slices_subtask.py
index f1cd082c7..54c42a105 100644
--- a/mpas_analysis/ocean/remap_depth_slices_subtask.py
+++ b/mpas_analysis/ocean/remap_depth_slices_subtask.py
@@ -1,16 +1,13 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 import numpy as np
 
@@ -19,7 +16,7 @@
 from mpas_analysis.ocean.utility import compute_zmid
 
 
-class RemapDepthSlicesSubtask(RemapMpasClimatologySubtask):  # {{{
+class RemapDepthSlicesSubtask(RemapMpasClimatologySubtask):
     """
     A task for creating and remapping climatologies of MPAS fields sliced
     at a given set of depths
@@ -43,8 +40,8 @@ class RemapDepthSlicesSubtask(RemapMpasClimatologySubtask):  # {{{
     def __init__(self, mpasClimatologyTask, parentTask, climatologyName,
                  variableList, seasons, depths, comparisonGridNames=['latlon'],
                  iselValues=None):
-        # {{{
-        '''
+
+        """
         Construct the analysis task and adds it as a subtask of the
         ``parentTask``.
 
@@ -81,7 +78,7 @@ def __init__(self, mpasClimatologyTask, parentTask, climatologyName,
         iselValues : dict, optional
             A dictionary of dimensions and indices (or ``None``) used to
             extract a slice of the MPAS field(s).
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -94,7 +91,7 @@ def __init__(self, mpasClimatologyTask, parentTask, climatologyName,
             mpasClimatologyTask, parentTask, climatologyName, variableList,
             seasons, comparisonGridNames, iselValues)
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Compute climatologies of T or S  from ACME/MPAS output
 
@@ -171,7 +168,7 @@ def run_task(self):  # {{{
         # which will perform the main function of the task
         super(RemapDepthSlicesSubtask, self).run_task()
 
-    def customize_masked_climatology(self, climatology, season):  # {{{
+    def customize_masked_climatology(self, climatology, season):
         """
         Uses ``verticalIndex`` to slice the 3D climatology field at each
         requested depth.  The resulting field has the depth appended to
@@ -223,9 +220,4 @@ def customize_masked_climatology(self, climatology, season):  # {{{
 
         climatology = climatology.transpose('depthSlice', 'nCells')
 
-        return climatology  # }}}
-
-    # }}}
-
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return climatology
diff --git a/mpas_analysis/ocean/remap_sose_climatology.py b/mpas_analysis/ocean/remap_sose_climatology.py
index 97974192b..c9ae5fe7e 100644
--- a/mpas_analysis/ocean/remap_sose_climatology.py
+++ b/mpas_analysis/ocean/remap_sose_climatology.py
@@ -1,17 +1,17 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-'''
+"""
 Analysis tasks for comparing Antarctic climatology maps against observations
 and reanalysis data.
-'''
+"""
 # Authors
 # -------
 # Xylar Asay-Davis
@@ -25,7 +25,7 @@
 
 
 class RemapSoseClimatology(RemapObservedClimatologySubtask):
-    # {{{
+
     """
     A subtask for reading and remapping SOSE fields to the comparison grid
     """
@@ -37,8 +37,8 @@ def __init__(self, parentTask, seasons, fileName, outFilePrefix,
                  fieldName, botFieldName=None, depths=None,
                  comparisonGridNames=['latlon'],
                  subtaskName='remapObservations'):
-        # {{{
-        '''
+
+        """
         Construct one analysis subtask for each plot (i.e. each season and
         comparison grid) and a subtask for computing climatologies.
 
@@ -74,7 +74,7 @@ def __init__(self, parentTask, seasons, fileName, outFilePrefix,
 
         subtaskName : str, optional
             The name of the subtask
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -91,10 +91,9 @@ def __init__(self, parentTask, seasons, fileName, outFilePrefix,
         super(RemapSoseClimatology, self).__init__(
             parentTask, seasons, fileName, outFilePrefix,
             comparisonGridNames, subtaskName)
-        # }}}
 
-    def get_observation_descriptor(self, fileName):  # {{{
-        '''
+    def get_observation_descriptor(self, fileName):
+        """
         get a MeshDescriptor for the observation grid
 
         Parameters
@@ -106,7 +105,7 @@ def get_observation_descriptor(self, fileName):  # {{{
         -------
         obsDescriptor : ``MeshDescriptor``
             The descriptor for the observation grid
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -116,10 +115,10 @@ def get_observation_descriptor(self, fileName):  # {{{
         projection = get_pyproj_projection(comparison_grid_name='antarctic')
         obsDescriptor = ProjectionGridDescriptor.read(
             projection, fileName=fileName, xVarName='x', yVarName='y')
-        return obsDescriptor  # }}}
+        return obsDescriptor
 
-    def build_observational_dataset(self, fileName):  # {{{
-        '''
+    def build_observational_dataset(self, fileName):
+        """
         read in the data sets for observations, and possibly rename some
         variables and dimensions
 
@@ -132,7 +131,7 @@ def build_observational_dataset(self, fileName):  # {{{
         -------
         dsObs : ``xarray.Dataset``
             The observational dataset
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -166,8 +165,4 @@ def build_observational_dataset(self, fileName):  # {{{
             dsObs = xr.Dataset(data_vars={self.fieldName: field},
                                coords={'depthSlice': depthNames})
 
-        return dsObs  # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return dsObs
diff --git a/mpas_analysis/ocean/sose_transects.py b/mpas_analysis/ocean/sose_transects.py
index 31e7caf90..f1270a6f0 100644
--- a/mpas_analysis/ocean/sose_transects.py
+++ b/mpas_analysis/ocean/sose_transects.py
@@ -1,16 +1,13 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 import numpy
 import os
@@ -31,34 +28,33 @@
 from mpas_analysis.shared.io import write_netcdf
 
 
-class SoseTransects(AnalysisTask):  # {{{
+class SoseTransects(AnalysisTask):
     """
     Plot model output at WOCE transects and compare it against WOCE
     observations
     """
+
     # Authors
     # -------
     # Xylar Asay-Davis
 
     def __init__(self, config, mpasClimatologyTask, controlConfig=None):
-
-        # {{{
-        '''
+        """
         Construct the analysis task and adds it as a subtask of the
         ``parentTask``.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
             The task that produced the climatology to be remapped and plotted
             as a transect
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -73,7 +69,7 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):
 
         sectionName = self.taskName
 
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         horizontalResolution = config.get(sectionName, 'horizontalResolution')
 
@@ -83,13 +79,13 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):
         if verticalComparisonGridName in ['mpas', 'obs']:
             verticalComparisonGrid = None
         else:
-            verticalComparisonGrid = config.getExpression(
-                sectionName, 'verticalComparisonGrid', usenumpyfunc=True)
+            verticalComparisonGrid = config.getexpression(
+                sectionName, 'verticalComparisonGrid', use_numpyfunc=True)
 
-        verticalBounds = config.getExpression(sectionName, 'verticalBounds')
+        verticalBounds = config.getexpression(sectionName, 'verticalBounds')
 
-        longitudes = sorted(config.getExpression(sectionName, 'longitudes',
-                                                 usenumpyfunc=True))
+        longitudes = sorted(config.getexpression(sectionName, 'longitudes',
+                                                 use_numpyfunc=True))
 
         fields = \
             [{'prefix': 'temperature',
@@ -127,9 +123,15 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):
               'units': r'm s$^{-1}$',
               'titleName': 'Velocity Magnitude',
               'obsFilePrefix': None,
-              'obsFieldName': 'velMag'}]
+              'obsFieldName': 'velMag'},
+             {'prefix': 'potentialDensityContour',
+              'mpas': 'timeMonthly_avg_potentialDensity',
+              'units': r'kg m$^{-3}$',
+              'titleName': 'Potential Density Contours',
+              'obsFilePrefix': 'pot_den',
+              'obsFieldName': 'potentialDensity'}]
 
-        fieldList = config.getExpression(sectionName, 'fieldList')
+        fieldList = config.getexpression(sectionName, 'fieldList')
         fields = [field for field in fields if field['prefix'] in fieldList]
 
         variableList = [field['mpas'] for field in fields
@@ -209,12 +211,9 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):
                         verticalBounds=verticalBounds)
 
                     self.add_subtask(subtask)
-        # }}}
-
-    # }}}
 
 
-class SoseTransectsObservations(TransectsObservations):  # {{{
+class SoseTransectsObservations(TransectsObservations):
     """
     A class for loading and manipulating SOSE transect data
 
@@ -224,19 +223,20 @@ class SoseTransectsObservations(TransectsObservations):  # {{{
     fields : list of dict
         dictionaries defining the fields with associated SOSE data
     """
+
     # Authors
     # -------
     # Xylar Asay-Davis
 
     def __init__(self, config, horizontalResolution,
                  transectCollectionName, fields):
-        # {{{
-        '''
+
+        """
         Construct the object, setting the observations dictionary to None.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         horizontalResolution : str
@@ -250,7 +250,7 @@ def __init__(self, config, horizontalResolution,
 
         fields : list of dict
             dictionaries defining the fields with associated SOSE data
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -265,17 +265,15 @@ def __init__(self, config, horizontalResolution,
 
         self.fields = fields
 
-        # }}}
-
-    def get_observations(self):  # {{{
-        '''
+    def get_observations(self):
+        """
         Read in and set up the observations.
 
         Returns
         -------
         obsDatasets : OrderedDict
             The observational dataset
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -285,20 +283,20 @@ def get_observations(self):  # {{{
             self.combine_observations()
 
         # then, call the method from the parent class
-        return super(SoseTransectsObservations, self).get_observations()  # }}}
+        return super(SoseTransectsObservations, self).get_observations()
 
-    def combine_observations(self):  # {{{
-        '''
+    def combine_observations(self):
+        """
         Combine SOSE oservations into a single file
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
 
         config = self.config
 
-        longitudes = sorted(config.getExpression('soseTransects', 'longitudes',
-                                                 usenumpyfunc=True))
+        longitudes = sorted(config.getexpression('soseTransects', 'longitudes',
+                                                 use_numpyfunc=True))
 
         observationsDirectory = build_obs_path(
             config, 'ocean', 'soseSubdirectory')
@@ -331,13 +329,12 @@ def combine_observations(self):  # {{{
         for field in self.fields:
             prefix = field['obsFilePrefix']
             fieldName = field['obsFieldName']
-            if prefix is None:
+            if prefix is None or (dsObs is not None and fieldName in dsObs):
                 continue
             print('  {}'.format(field['prefix']))
 
-            fileName = '{}/SOSE_2005-2010_monthly_{}_SouthernOcean' \
-                       '_0.167x0.167degree_20180710.nc'.format(
-                           observationsDirectory, prefix)
+            fileName = f'{observationsDirectory}/SOSE_2005-2010_monthly_' \
+                       f'{prefix}_SouthernOcean_0.167x0.167degree_20180710.nc'
 
             dsLocal = xr.open_dataset(fileName)
 
@@ -377,7 +374,7 @@ def combine_observations(self):  # {{{
                           'from 2005-2010 average of the Southern Ocean ' \
                           'State Estimate (SOSE)'
             dsObs['velMag'] = numpy.sqrt(
-                dsObs.zonalVel**2 + dsObs.meridVel**2)
+                dsObs.zonalVel ** 2 + dsObs.meridVel ** 2)
             dsObs.velMag.attrs['units'] = 'm s$^{-1}$'
             dsObs.velMag.attrs['description'] = description
 
@@ -390,10 +387,8 @@ def combine_observations(self):  # {{{
 
         print('  Done.')
 
-        # }}}
-
-    def build_observational_dataset(self, fileName, transectName):  # {{{
-        '''
+    def build_observational_dataset(self, fileName, transectName):
+        """
         read in the data sets for observations, and possibly rename some
         variables and dimensions
 
@@ -409,7 +404,7 @@ def build_observational_dataset(self, fileName, transectName):  # {{{
         -------
         dsObs : ``xarray.Dataset``
             The observational dataset
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -429,9 +424,4 @@ def build_observational_dataset(self, fileName, transectName):  # {{{
         dsObs['lon'] = ('nPoints', lon * numpy.ones(dsObs.sizes['nPoints']))
         dsObs = dsObs.drop_vars(['nPoints', 'nz'])
 
-        return dsObs  # }}}
-
-    # }}}
-
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return dsObs
diff --git a/mpas_analysis/ocean/streamfunction_moc.py b/mpas_analysis/ocean/streamfunction_moc.py
index c192e484e..d9ff263b2 100644
--- a/mpas_analysis/ocean/streamfunction_moc.py
+++ b/mpas_analysis/ocean/streamfunction_moc.py
@@ -1,19 +1,16 @@
 # -*- coding: utf-8 -*-
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 #
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 import numpy as np
 import netCDF4
@@ -41,7 +38,7 @@
 from mpas_analysis.shared.regions import ComputeRegionMasksSubtask
 
 
-class StreamfunctionMOC(AnalysisTask):  # {{{
+class StreamfunctionMOC(AnalysisTask):
     """
     Computation and plotting of model meridional overturning circulation.
     Will eventually support:
@@ -55,19 +52,19 @@ class StreamfunctionMOC(AnalysisTask):  # {{{
     # -------
     # Milena Veneziani, Mark Petersen, Phillip Wolfram, Xylar Asay-Davis
 
-    def __init__(self, config, mpasClimatologyTask, controlConfig=None):  # {{{
+    def __init__(self, config, mpasClimatologyTask, controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  instance of MpasAnalysisConfigParser
+        config :  mpas_tools.config.MpasConfigParser
             Contains configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
             The task that produced the climatology to be remapped and plotted
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -116,11 +113,8 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):  # {{{
         plotTimeSeriesSubtask = PlotMOCTimeSeriesSubtask(self, controlConfig)
         plotTimeSeriesSubtask.run_after(combineTimeSeriesSubtask)
 
-        # }}}
-    # }}}
-
 
-class ComputeMOCMasksSubtask(ComputeRegionMasksSubtask):  # {{{
+class ComputeMOCMasksSubtask(ComputeRegionMasksSubtask):
     """
     An analysis subtasks for computing cell masks and southern transects for
     MOC regions
@@ -130,7 +124,7 @@ class ComputeMOCMasksSubtask(ComputeRegionMasksSubtask):  # {{{
     # Xylar Asay-Davis
 
     def __init__(self, parentTask):
-        # {{{
+
         """
         Construct the analysis task and adds it as a subtask of the
         ``parentTask``.
@@ -149,9 +143,7 @@ def __init__(self, parentTask):
         meshName = config.get('input', 'mpasMeshName')
         regionGroup = 'MOC Basins'
 
-        subprocessCount = config.getWithDefault('execute',
-                                                'parallelTaskCount',
-                                                default=1)
+        subprocessCount = config.getint('execute', 'parallelTaskCount')
 
         # call the constructor from the base class (ComputeRegionMasksSubtask)
         super().__init__(
@@ -161,9 +153,7 @@ def __init__(self, parentTask):
 
         self.maskAndTransectFileName = None
 
-        # }}}
-
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
 
@@ -184,9 +174,8 @@ def setup_and_check(self):  # {{{
         self.maskAndTransectFileName = get_region_mask(
             self.config, '{}_mocBasinsAndTransects{}.nc'.format(
                 self.meshName, self.date))
-        # }}}
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Compute the requested climatologies
         """
@@ -210,11 +199,10 @@ def run_task(self):  # {{{
 
         write_netcdf(dsMasksAndTransects, self.maskAndTransectFileName,
                      char_dim_name='StrLen')
-        # }}}
 # }}}
 
 
-class ComputeMOCClimatologySubtask(AnalysisTask):  # {{{
+class ComputeMOCClimatologySubtask(AnalysisTask):
     """
     Computation of a climatology of the model meridional overturning
     circulation.
@@ -230,7 +218,7 @@ class ComputeMOCClimatologySubtask(AnalysisTask):  # {{{
     # -------
     # Milena Veneziani, Mark Petersen, Phillip Wolfram, Xylar Asay-Davis
 
-    def __init__(self, parentTask, mpasClimatologyTask, maskSubtask):  # {{{
+    def __init__(self, parentTask, mpasClimatologyTask, maskSubtask):
         """
         Construct the analysis task.
 
@@ -264,9 +252,8 @@ def __init__(self, parentTask, mpasClimatologyTask, maskSubtask):  # {{{
         self.run_after(maskSubtask)
 
         parentTask.add_subtask(self)
-        # }}}
 
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
 
@@ -299,7 +286,7 @@ def setup_and_check(self):  # {{{
 
         self.sectionName = 'streamfunctionMOC'
 
-        self.usePostprocessing = config.getExpression(
+        self.usePostprocessing = config.getexpression(
             self.sectionName, 'usePostprocessingScript')
 
         if not self.usePostprocessing and self.mocAnalysisMemberEnabled:
@@ -326,9 +313,7 @@ def setup_and_check(self):  # {{{
         self.mpasClimatologyTask.add_variables(variableList=variableList,
                                                seasons=['ANN'])
 
-        # }}}
-
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Process MOC analysis member data if available, or compute MOC at
         post-processing if not.
@@ -346,9 +331,7 @@ def run_task(self):  # {{{
         else:
             self._compute_moc_climo_postprocess()
 
-        # }}}
-
-    def _compute_moc_climo_analysismember(self):  # {{{
+    def _compute_moc_climo_analysismember(self):
         """compute mean MOC streamfunction from analysis member"""
 
         config = self.config
@@ -364,7 +347,7 @@ def _compute_moc_climo_analysismember(self):  # {{{
         if os.path.exists(outputFileName):
             return
 
-        regionNames = config.getExpression(self.sectionName, 'regionNames')
+        regionNames = config.getexpression(self.sectionName, 'regionNames')
         regionNames.append('Global')
 
         # Read in depth and bin latitudes
@@ -478,9 +461,8 @@ def _compute_moc_climo_analysismember(self):  # {{{
         depthVar.units = 'meters'
         depthVar[:] = depth
         ncFile.close()
-        # }}}
 
-    def _compute_moc_climo_postprocess(self):  # {{{
+    def _compute_moc_climo_postprocess(self):
         """compute mean MOC streamfunction as a post-process"""
 
         config = self.config
@@ -498,7 +480,7 @@ def _compute_moc_climo_postprocess(self):  # {{{
         dvEdge, areaCell, refBottomDepth, latCell, nVertLevels, \
             refTopDepth, refLayerThickness = _load_mesh(self.runStreams)
 
-        regionNames = config.getExpression(self.sectionName, 'regionNames')
+        regionNames = config.getexpression(self.sectionName, 'regionNames')
 
         # Load basin region related variables and save them to dictionary
         mpasMeshName = config.get('input', 'mpasMeshName')
@@ -617,12 +599,9 @@ def _compute_moc_climo_postprocess(self):  # {{{
         depthVar.units = 'meters'
         depthVar[:] = depth
         ncFile.close()
-        # }}}
-
-    # }}}
 
 
-class PlotMOCClimatologySubtask(AnalysisTask):  # {{{
+class PlotMOCClimatologySubtask(AnalysisTask):
     """
     Computation of a climatology of the model meridional overturning
     circulation.
@@ -631,7 +610,7 @@ class PlotMOCClimatologySubtask(AnalysisTask):  # {{{
     # -------
     # Milena Veneziani, Mark Petersen, Phillip Wolfram, Xylar Asay-Davis
 
-    def __init__(self, parentTask, controlConfig):  # {{{
+    def __init__(self, parentTask, controlConfig):
         """
         Construct the analysis task.
 
@@ -640,7 +619,7 @@ def __init__(self, parentTask, controlConfig):  # {{{
         parentTask : ``StreamfunctionMOC``
             The main task of which this is a subtask
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -658,9 +637,8 @@ def __init__(self, parentTask, controlConfig):  # {{{
         parentTask.add_subtask(self)
 
         self.controlConfig = controlConfig
-        # }}}
 
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
 
@@ -692,7 +670,7 @@ def setup_and_check(self):  # {{{
 
         mainRunName = config.get('runs', 'mainRunName')
 
-        self.regionNames = ['Global'] + config.getExpression(self.sectionName,
+        self.regionNames = ['Global'] + config.getexpression(self.sectionName,
                                                              'regionNames')
 
         for region in self.regionNames:
@@ -704,9 +682,7 @@ def setup_and_check(self):  # {{{
                                                         filePrefix))
             self.filePrefixes[region] = filePrefix
 
-        # }}}
-
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Plot the MOC climatology
         """
@@ -750,9 +726,9 @@ def run_task(self):  # {{{
             z = depth
             regionMOC = moc[region]
             # Subset lat range
-            minLat = config.getExpression('streamfunctionMOC{}'.format(region),
+            minLat = config.getexpression('streamfunctionMOC{}'.format(region),
                                           'latBinMin')
-            maxLat = config.getExpression('streamfunctionMOC{}'.format(region),
+            maxLat = config.getexpression('streamfunctionMOC{}'.format(region),
                                           'latBinMax')
             indLat = np.logical_and(x >= minLat, x <= maxLat)
             x = x.where(indLat, drop=True)
@@ -793,9 +769,9 @@ def run_task(self):  # {{{
                 groupLink='moc',
                 thumbnailDescription=region,
                 imageDescription=caption,
-                imageCaption=caption)  # }}}
+                imageCaption=caption)
 
-    def _load_moc(self, config):  # {{{
+    def _load_moc(self, config):
         """compute mean MOC streamfunction from analysis member"""
 
         startYear = config.getint('climatology', 'startYear')
@@ -817,12 +793,10 @@ def _load_moc(self, config):  # {{{
         for region in self.regionNames:
             lat[region] = ds['lat{}'.format(region)]
             moc[region] = ds['moc{}'.format(region)]
-        return depth, lat, moc  # }}}
-
-    # }}}
+        return depth, lat, moc
 
 
-class ComputeMOCTimeSeriesSubtask(AnalysisTask):  # {{{
+class ComputeMOCTimeSeriesSubtask(AnalysisTask):
     """
     Computation of a time series of max Atlantic MOC at 26.5N.
     """
@@ -830,7 +804,7 @@ class ComputeMOCTimeSeriesSubtask(AnalysisTask):  # {{{
     # -------
     # Milena Veneziani, Mark Petersen, Phillip Wolfram, Xylar Asay-Davis
 
-    def __init__(self, parentTask, startYear, endYear, maskSubtask):  # {{{
+    def __init__(self, parentTask, startYear, endYear, maskSubtask):
         """
         Construct the analysis task.
 
@@ -868,9 +842,8 @@ def __init__(self, parentTask, startYear, endYear, maskSubtask):  # {{{
         parentTask.add_subtask(self)
         self.startYear = startYear
         self.endYear = endYear
-        # }}}
 
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
 
@@ -898,7 +871,7 @@ def setup_and_check(self):  # {{{
 
         self.sectionName = 'streamfunctionMOC'
 
-        self.usePostprocessing = config.getExpression(
+        self.usePostprocessing = config.getexpression(
             self.sectionName, 'usePostprocessingScript')
 
         if not self.usePostprocessing and self.mocAnalysisMemberEnabled:
@@ -921,9 +894,8 @@ def setup_and_check(self):  # {{{
                 self.variableList.extend(
                     ['timeMonthly_avg_normalGMBolusVelocity',
                      'timeMonthly_avg_vertGMBolusVelocityTop'])
-        # }}}
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Process MOC analysis member data if available, or compute MOC at
         post-processing if not.
@@ -943,9 +915,8 @@ def run_task(self):  # {{{
             self._compute_moc_time_series_analysismember()
         else:
             self._compute_moc_time_series_postprocess()
-        # }}}
 
-    def _compute_moc_time_series_analysismember(self):  # {{{
+    def _compute_moc_time_series_analysismember(self):
         """compute MOC time series from analysis member"""
 
         # Compute and plot time series of Atlantic MOC at 26.5N (RAPID array)
@@ -1081,9 +1052,8 @@ def _compute_moc_time_series_analysismember(self):  # {{{
                                               'description': description}}}}
         dsMOCTimeSeries = xr.Dataset.from_dict(dictonary)
         write_netcdf(dsMOCTimeSeries, outputFileName)
-        # }}}
 
-    def _compute_moc_time_series_postprocess(self):  # {{{
+    def _compute_moc_time_series_postprocess(self):
         """compute MOC time series as a post-process"""
 
         config = self.config
@@ -1240,11 +1210,9 @@ def _compute_moc_time_series_postprocess(self):  # {{{
                                               'description': description}}}}
         dsMOCTimeSeries = xr.Dataset.from_dict(dictonary)
         write_netcdf(dsMOCTimeSeries, outputFileName)
-        # }}}
-    # }}}
 
 
-class CombineMOCTimeSeriesSubtask(AnalysisTask):  # {{{
+class CombineMOCTimeSeriesSubtask(AnalysisTask):
     """
     Combine individual time series of max Atlantic MOC at 26.5N into a single
     data set
@@ -1253,7 +1221,7 @@ class CombineMOCTimeSeriesSubtask(AnalysisTask):  # {{{
     # -------
     # Xylar Asay-Davis
 
-    def __init__(self, parentTask, startYears, endYears):  # {{{
+    def __init__(self, parentTask, startYears, endYears):
         """
         Construct the analysis task.
 
@@ -1262,7 +1230,7 @@ def __init__(self, parentTask, startYears, endYears):  # {{{
         parentTask : ``StreamfunctionMOC``
             The main task of which this is a subtask
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -1280,9 +1248,8 @@ def __init__(self, parentTask, startYears, endYears):  # {{{
         parentTask.add_subtask(self)
         self.startYears = startYears
         self.endYears = endYears
-        # }}}
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Plot the MOC time series
         """
@@ -1315,11 +1282,10 @@ def run_task(self):  # {{{
 
         ds.load()
 
-        write_netcdf(ds, outputFileName)  # }}}
-    # }}}
+        write_netcdf(ds, outputFileName)
 
 
-class PlotMOCTimeSeriesSubtask(AnalysisTask):  # {{{
+class PlotMOCTimeSeriesSubtask(AnalysisTask):
     """
     Plots a time series of max Atlantic MOC at 26.5N.
     """
@@ -1327,7 +1293,7 @@ class PlotMOCTimeSeriesSubtask(AnalysisTask):  # {{{
     # -------
     # Milena Veneziani, Mark Petersen, Phillip Wolfram, Xylar Asay-Davis
 
-    def __init__(self, parentTask, controlConfig):  # {{{
+    def __init__(self, parentTask, controlConfig):
         """
         Construct the analysis task.
 
@@ -1336,7 +1302,7 @@ def __init__(self, parentTask, controlConfig):  # {{{
         parentTask : ``StreamfunctionMOC``
             The main task of which this is a subtask
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -1354,9 +1320,8 @@ def __init__(self, parentTask, controlConfig):  # {{{
         parentTask.add_subtask(self)
 
         self.controlConfig = controlConfig
-        # }}}
 
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
 
@@ -1387,9 +1352,7 @@ def setup_and_check(self):  # {{{
                                                 filePrefix)]
         self.filePrefix = filePrefix
 
-        # }}}
-
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Plot the MOC time series
         """
@@ -1471,9 +1434,7 @@ def run_task(self):  # {{{
             imageDescription=caption,
             imageCaption=caption)
 
-        # }}}
-
-    def _load_moc(self, config):  # {{{
+    def _load_moc(self, config):
         """compute mean MOC streamfunction from analysis member"""
 
         outputDirectory = build_config_full_path(config, 'output',
@@ -1486,12 +1447,10 @@ def _load_moc(self, config):  # {{{
             outputDirectory, startYear, endYear)
 
         dsMOCTimeSeries = xr.open_dataset(inputFileName, decode_times=False)
-        return dsMOCTimeSeries  # }}}
+        return dsMOCTimeSeries
 
-    # }}}
 
-
-def _load_mesh(runStreams):  # {{{
+def _load_mesh(runStreams):
     # Load mesh related variables
     try:
         restartFile = runStreams.readpath('restart')[0]
@@ -1515,12 +1474,9 @@ def _load_mesh(runStreams):  # {{{
 
     return dvEdge, areaCell, refBottomDepth, latCell, nVertLevels, \
         refTopDepth, refLayerThickness
-    # }}}
 
 
 def _build_region_mask_dict(regionMaskFile, regionNames, mpasMeshName, logger):
-    # {{{
-
     if not os.path.exists(regionMaskFile):
         raise IOError('Regional masking file {} for MOC calculation '
                       'does not exist'.format(regionMaskFile))
@@ -1555,12 +1511,12 @@ def _build_region_mask_dict(regionMaskFile, regionNames, mpasMeshName, logger):
             'transectEdgeMaskSigns': transectEdgeMaskSigns,
             'transectEdgeGlobalIDs': transectEdgeGlobalIDs}
 
-    return dictRegion  # }}}
+    return dictRegion
 
 
 def _compute_transport(maxEdgesInTransect, transectEdgeGlobalIDs,
                        transectEdgeMaskSigns, nz, dvEdge,
-                       refLayerThickness, horizontalVel):  # {{{
+                       refLayerThickness, horizontalVel):
     """compute mass transport across southern transect of ocean basin"""
 
     transportZEdge = np.zeros([nz, maxEdgesInTransect])
@@ -1574,11 +1530,11 @@ def _compute_transport(maxEdgesInTransect, transectEdgeGlobalIDs,
             dvEdge[iEdge, np.newaxis] * \
             refLayerThickness[np.newaxis, :]
     transportZ = transportZEdge.sum(axis=1)
-    return transportZ  # }}}
+    return transportZ
 
 
 def _compute_moc(latBins, nz, latCell, regionCellMask, transportZ,
-                 velArea):  # {{{
+                 velArea):
     """compute meridionally integrated MOC streamfunction"""
 
     mocTop = np.zeros([np.size(latBins), nz + 1])
@@ -1592,7 +1548,7 @@ def _compute_moc(latBins, nz, latCell, regionCellMask, transportZ,
     # convert m^3/s to Sverdrup
     mocTop = mocTop * m3ps_to_Sv
     mocTop = mocTop.T
-    return mocTop  # }}}
+    return mocTop
 
 
 def _interp_moc(x, z, regionMOC, refX, refZ, refMOC):
@@ -1618,5 +1574,3 @@ def _interp_moc(x, z, regionMOC, refX, refZ, refMOC):
             left=np.nan, right=np.nan)
 
     return xr.DataArray(dims=dims, data=refRegionMOC)
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/ocean/time_series_antarctic_melt.py b/mpas_analysis/ocean/time_series_antarctic_melt.py
index 8b5b0e09f..c429f521d 100644
--- a/mpas_analysis/ocean/time_series_antarctic_melt.py
+++ b/mpas_analysis/ocean/time_series_antarctic_melt.py
@@ -1,16 +1,13 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import os
 import xarray
 import numpy
@@ -34,7 +31,7 @@
 from mpas_analysis.shared.html import write_image_xml
 
 
-class TimeSeriesAntarcticMelt(AnalysisTask):  # {{{
+class TimeSeriesAntarcticMelt(AnalysisTask):
     """
     Performs analysis of the time-series output of Antarctic sub-ice-shelf
     melt rates.
@@ -45,13 +42,13 @@ class TimeSeriesAntarcticMelt(AnalysisTask):  # {{{
 
     def __init__(self, config, mpasTimeSeriesTask, regionMasksTask,
                  controlConfig=None):
-        # {{{
+
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasTimeSeriesTask : ``MpasTimeSeriesTask``
@@ -60,7 +57,7 @@ def __init__(self, config, mpasTimeSeriesTask, regionMasksTask,
         regionMasksTask : ``ComputeRegionMasks``
             A task for computing region masks
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -75,7 +72,7 @@ def __init__(self, config, mpasTimeSeriesTask, regionMasksTask,
             tags=['timeSeries', 'melt', 'landIceCavities', 'antarctic'])
 
         regionGroup = 'Ice Shelves'
-        iceShelvesToPlot = config.getExpression('timeSeriesAntarcticMelt',
+        iceShelvesToPlot = config.getexpression('timeSeriesAntarcticMelt',
                                                 'iceShelvesToPlot')
         if len(iceShelvesToPlot) == 0:
             # nothing else to do
@@ -122,12 +119,8 @@ def __init__(self, config, mpasTimeSeriesTask, regionMasksTask,
             plotMeltSubtask.run_after(combineSubtask)
             self.add_subtask(plotMeltSubtask)
 
-        # }}}
-
-    # }}}
 
-
-class ComputeMeltSubtask(AnalysisTask):  # {{{
+class ComputeMeltSubtask(AnalysisTask):
     """
     Computes time-series of Antarctic sub-ice-shelf melt rates.
 
@@ -147,7 +140,7 @@ class ComputeMeltSubtask(AnalysisTask):  # {{{
     # Xylar Asay-Davis, Stephen Price
 
     def __init__(self, parentTask, startYear, endYear, mpasTimeSeriesTask,
-                 masksSubtask, iceShelvesToPlot):  # {{{
+                 masksSubtask, iceShelvesToPlot):
         """
         Construct the analysis task.
 
@@ -193,9 +186,8 @@ def __init__(self, parentTask, startYear, endYear, mpasTimeSeriesTask,
         self.endDate = '{:04d}-12-31_23:59:59'.format(self.endYear)
         self.variableList = \
             ['timeMonthly_avg_landIceFreshwaterFlux']
-        # }}}
 
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
 
@@ -239,9 +231,9 @@ def setup_and_check(self):  # {{{
 
         self.mpasTimeSeriesTask.add_variables(variableList=self.variableList)
 
-        return  # }}}
+        return
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Computes time-series of Antarctic sub-ice-shelf melt rates.
         """
@@ -364,11 +356,8 @@ def run_task(self):  # {{{
 
         write_netcdf(dsOut, outFileName)
 
-        # }}}
-    # }}}
-
 
-class CombineMeltSubtask(AnalysisTask):  # {{{
+class CombineMeltSubtask(AnalysisTask):
     """
     Combine individual time series into a single data set
     """
@@ -376,7 +365,7 @@ class CombineMeltSubtask(AnalysisTask):  # {{{
     # -------
     # Xylar Asay-Davis
 
-    def __init__(self, parentTask, startYears, endYears):  # {{{
+    def __init__(self, parentTask, startYears, endYears):
         """
         Construct the analysis task.
 
@@ -404,9 +393,8 @@ def __init__(self, parentTask, startYears, endYears):  # {{{
 
         self.startYears = startYears
         self.endYears = endYears
-        # }}}
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Combine the time series
         """
@@ -434,8 +422,6 @@ def run_task(self):  # {{{
             ds.load()
 
             write_netcdf(ds, outFileName)
-        # }}}
-    # }}}
 
 
 class PlotMeltSubtask(AnalysisTask):
@@ -450,7 +436,7 @@ class PlotMeltSubtask(AnalysisTask):
     regionIndex : int
         The index into the dimension ``nRegions`` of the ice shelf to plot
 
-    controlConfig : ``MpasAnalysisConfigParser``
+    controlConfig : mpas_tools.config.MpasConfigParser
         The configuration options for the control run (if any)
 
     """
@@ -459,7 +445,7 @@ class PlotMeltSubtask(AnalysisTask):
     # Xylar Asay-Davis, Stephen Price
 
     def __init__(self, parentTask, iceShelf, regionIndex, controlConfig):
-        # {{{
+
         """
         Construct the analysis task.
 
@@ -475,7 +461,7 @@ def __init__(self, parentTask, iceShelf, regionIndex, controlConfig):
         regionIndex : int
             The index into the dimension ``nRegions`` of the ice shelf to plot
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -495,9 +481,7 @@ def __init__(self, parentTask, iceShelf, regionIndex, controlConfig):
         self.regionIndex = regionIndex
         self.controlConfig = controlConfig
 
-        # }}}
-
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
 
@@ -522,9 +506,9 @@ def setup_and_check(self):  # {{{
             self.xmlFileNames.append(
                 '{}/{}_{}.xml'.format(self.plotsDirectory, prefix,
                                       self.iceShelf.replace(' ', '_')))
-        return  # }}}
+        return
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Plots time-series output of Antarctic sub-ice-shelf melt rates.
         """
@@ -599,8 +583,8 @@ def run_task(self):  # {{{
         # If areas from obs file used need to be converted from sq km to sq m
 
         mainRunName = config.get('runs', 'mainRunName')
-        movingAverageMonths = config.getint('timeSeriesAntarcticMelt',
-                                            'movingAverageMonths')
+        movingAveragePoints = config.getint('timeSeriesAntarcticMelt',
+                                            'movingAveragePoints')
 
         outputDirectory = build_config_full_path(config, 'output',
                                                  'timeseriesSubdirectory')
@@ -677,14 +661,10 @@ def run_task(self):  # {{{
         else:
             defaultFontSize = None
 
-        if self.iceShelf != 'Antarctica' and self.iceShelf != 'Filchner':
-            # we only need the legend in those 2
-            legendText = None
-
         fig = timeseries_analysis_plot(config, fields, calendar=calendar,
                                        title=title, xlabel=xLabel,
                                        ylabel=yLabel,
-                                       movingAveragePoints=movingAverageMonths,
+                                       movingAveragePoints=movingAveragePoints,
                                        lineColors=lineColors,
                                        lineWidths=lineWidths,
                                        legendText=legendText,
@@ -752,7 +732,7 @@ def run_task(self):  # {{{
         fig = timeseries_analysis_plot(config, fields, calendar=calendar,
                                        title=title, xlabel=xLabel,
                                        ylabel=yLabel,
-                                       movingAveragePoints=movingAverageMonths,
+                                       movingAveragePoints=movingAveragePoints,
                                        lineColors=lineColors,
                                        lineWidths=lineWidths,
                                        legendText=legendText,
@@ -783,9 +763,8 @@ def run_task(self):  # {{{
             thumbnailDescription=title,
             imageDescription=caption,
             imageCaption=caption)
-        # }}}
 
-    def _load_ice_shelf_fluxes(self, config):  # {{{
+    def _load_ice_shelf_fluxes(self, config):
         """
         Reads melt flux time series and computes regional total melt flux and
         mean melt rate.
@@ -805,8 +784,3 @@ def _load_ice_shelf_fluxes(self, config):  # {{{
 
         dsOut = xarray.open_dataset(outFileName)
         return dsOut.totalMeltFlux, dsOut.meltRates
-        # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/ocean/time_series_ocean_regions.py b/mpas_analysis/ocean/time_series_ocean_regions.py
index bef0375b2..ae169be51 100644
--- a/mpas_analysis/ocean/time_series_ocean_regions.py
+++ b/mpas_analysis/ocean/time_series_ocean_regions.py
@@ -1,22 +1,20 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import os
 import xarray
 import numpy
 import matplotlib.pyplot as plt
 
 from geometric_features import FeatureCollection, read_feature_collection
+from mpas_tools.cime.constants import constants as cime_constants
 
 from mpas_analysis.shared.analysis_task import AnalysisTask
 
@@ -35,7 +33,7 @@
 from mpas_analysis.shared.constants import constants
 
 
-class TimeSeriesOceanRegions(AnalysisTask):  # {{{
+class TimeSeriesOceanRegions(AnalysisTask):
     """
     Performs analysis of the time-series output of regionoal mean temperature,
     salinity, etc.
@@ -45,19 +43,19 @@ class TimeSeriesOceanRegions(AnalysisTask):  # {{{
     # Xylar Asay-Davis
 
     def __init__(self, config, regionMasksTask, controlConfig=None):
-        # {{{
+
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         regionMasksTask : ``ComputeRegionMasks``
             A task for computing region masks
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -80,7 +78,7 @@ def __init__(self, config, regionMasksTask, controlConfig=None):
         else:
             endYear = int(endYear)
 
-        regionGroups = config.getExpression(self.taskName, 'regionGroups')
+        regionGroups = config.getexpression(self.taskName, 'regionGroups')
 
         obsDicts = {
             'SOSE': {
@@ -123,7 +121,7 @@ def __init__(self, config, regionMasksTask, controlConfig=None):
                 regionGroup[1:].replace(' ', '')
             sectionName = 'timeSeries{}'.format(sectionSuffix)
 
-            regionNames = config.getExpression(sectionName, 'regionNames')
+            regionNames = config.getexpression(sectionName, 'regionNames')
             if len(regionNames) == 0:
                 # no regions in this group were requested
                 continue
@@ -135,7 +133,7 @@ def __init__(self, config, regionMasksTask, controlConfig=None):
 
             years = list(range(startYear, endYear + 1))
 
-            obsList = config.getExpression(sectionName, 'obs')
+            obsList = config.getexpression(sectionName, 'obs')
             groupObsDicts = {}
 
             for obsName in obsList:
@@ -198,12 +196,8 @@ def __init__(self, config, regionMasksTask, controlConfig=None):
                 plotRegionSubtask.run_after(combineSubtask)
                 self.add_subtask(plotRegionSubtask)
 
-        # }}}
-
-    # }}}
-
 
-class ComputeRegionDepthMasksSubtask(AnalysisTask):  # {{{
+class ComputeRegionDepthMasksSubtask(AnalysisTask):
     """
     Compute masks for regional and depth mean
 
@@ -223,7 +217,7 @@ class ComputeRegionDepthMasksSubtask(AnalysisTask):  # {{{
     # Xylar Asay-Davis
 
     def __init__(self, parentTask, masksSubtask, regionGroup, regionNames):
-        # {{{
+
         """
         Construct the analysis task.
 
@@ -260,9 +254,8 @@ def __init__(self, parentTask, masksSubtask, regionGroup, regionNames):
         self.masksSubtask = masksSubtask
         self.regionGroup = regionGroup
         self.regionNames = regionNames
-        # }}}
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Compute the regional-mean time series
         """
@@ -388,11 +381,9 @@ def run_task(self):  # {{{
         dsOut['areaCell'] = areaCell
         dsOut['regionNames'] = dsRegionMask.regionNames
         write_netcdf(dsOut, outFileName)
-        # }}}
-    # }}}
 
 
-class ComputeRegionTimeSeriesSubtask(AnalysisTask):  # {{{
+class ComputeRegionTimeSeriesSubtask(AnalysisTask):
     """
     Compute regional and depth mean at a function of time for a set of MPAS
     fields
@@ -416,7 +407,7 @@ class ComputeRegionTimeSeriesSubtask(AnalysisTask):  # {{{
     # Xylar Asay-Davis
 
     def __init__(self, parentTask, startYear, endYear, masksSubtask,
-                 regionGroup, regionNames):  # {{{
+                 regionGroup, regionNames):
         """
         Construct the analysis task.
 
@@ -459,9 +450,8 @@ def __init__(self, parentTask, startYear, endYear, masksSubtask,
         self.masksSubtask = masksSubtask
         self.regionGroup = regionGroup
         self.regionNames = regionNames
-        # }}}
 
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
 
@@ -485,9 +475,7 @@ def setup_and_check(self):  # {{{
             analysisOptionName='config_am_timeseriesstatsmonthly_enable',
             raiseException=True)
 
-        # }}}
-
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Compute the regional-mean time series
         """
@@ -527,10 +515,19 @@ def run_task(self):  # {{{
                                              self.historyStreams,
                                              'timeSeriesStatsMonthlyOutput')
 
-        variables = config.getExpression(sectionName, 'variables')
+        variables = config.getexpression(sectionName, 'variables')
+
+        variableList = {'timeMonthly_avg_layerThickness'}
 
-        variableList = [var['mpas'] for var in variables] + \
-            ['timeMonthly_avg_layerThickness']
+        for var in variables:
+            mpas_var = var['mpas']
+            if mpas_var == 'none':
+                continue
+            if isinstance(mpas_var, (list, tuple)):
+                for v in mpas_var:
+                    variableList.add(v)
+            else:
+                variableList.add(mpas_var)
 
         outputExists = os.path.exists(outFileName)
         outputValid = outputExists
@@ -601,10 +598,17 @@ def run_task(self):  # {{{
                 for var in variables:
                     outName = var['name']
                     self.logger.info('      {}'.format(outName))
-                    mpasVarName = var['mpas']
-                    timeSeries = dsIn[mpasVarName].where(cellMask, drop=True)
-                    units = timeSeries.units
-                    description = timeSeries.long_name
+                    if outName == 'thermalForcing':
+                        timeSeries = self._add_thermal_forcing(dsIn, cellMask)
+                        units = 'degrees Celsius'
+                        description = 'potential temperature minus the ' \
+                                      'potential freezing temperature'
+                    else:
+                        mpasVarName = var['mpas']
+                        timeSeries = \
+                            dsIn[mpasVarName].where(cellMask, drop=True)
+                        units = timeSeries.units
+                        description = timeSeries.long_name
 
                     is3d = 'nVertLevels' in timeSeries.dims
                     if is3d:
@@ -639,11 +643,42 @@ def run_task(self):  # {{{
         dsOut.coords['month'] = (('Time',), months)
         dsOut['month'].attrs['units'] = 'months'
 
-        write_netcdf(dsOut, outFileName)  # }}}
-    # }}}
+        write_netcdf(dsOut, outFileName)
+
+    def _add_thermal_forcing(self, dsIn, cellMask):
+        """ compute the thermal forcing """
+
+        c0 = self.namelist.getfloat(
+            'config_land_ice_cavity_freezing_temperature_coeff_0')
+        cs = self.namelist.getfloat(
+            'config_land_ice_cavity_freezing_temperature_coeff_S')
+        cp = self.namelist.getfloat(
+            'config_land_ice_cavity_freezing_temperature_coeff_p')
+        cps = self.namelist.getfloat(
+            'config_land_ice_cavity_freezing_temperature_coeff_pS')
 
+        vars = ['timeMonthly_avg_activeTracers_temperature',
+                'timeMonthly_avg_activeTracers_salinity',
+                'timeMonthly_avg_density',
+                'timeMonthly_avg_layerThickness']
+        ds = dsIn[vars].where(cellMask, drop=True)
 
-class CombineRegionalProfileTimeSeriesSubtask(AnalysisTask):  # {{{
+        temp = ds.timeMonthly_avg_activeTracers_temperature
+        salin = ds.timeMonthly_avg_activeTracers_salinity
+        dens = ds.timeMonthly_avg_density
+        thick = ds.timeMonthly_avg_layerThickness
+
+        dp = cime_constants['SHR_CONST_G']*dens*thick
+        press = dp.cumsum(dim='nVertLevels') - 0.5*dp
+
+        tempFreeze = c0 + cs*salin + cp*press + cps*press*salin
+
+        timeSeries = temp - tempFreeze
+
+        return timeSeries
+
+
+class CombineRegionalProfileTimeSeriesSubtask(AnalysisTask):
     """
     Combine individual time series into a single data set
     """
@@ -651,7 +686,7 @@ class CombineRegionalProfileTimeSeriesSubtask(AnalysisTask):  # {{{
     # -------
     # Xylar Asay-Davis
 
-    def __init__(self, parentTask, startYears, endYears, regionGroup):  # {{{
+    def __init__(self, parentTask, startYears, endYears, regionGroup):
         """
         Construct the analysis task.
 
@@ -686,9 +721,8 @@ def __init__(self, parentTask, startYears, endYears, regionGroup):  # {{{
         self.startYears = startYears
         self.endYears = endYears
         self.regionGroup = regionGroup
-        # }}}
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Combine the time series
         """
@@ -725,8 +759,6 @@ def run_task(self):  # {{{
                 ds[var] = ds[var].isel(Time=0, drop=True)
 
             write_netcdf(ds, outFileName)
-        # }}}
-    # }}}
 
 
 class ComputeObsRegionalTimeSeriesSubtask(AnalysisTask):
@@ -742,7 +774,7 @@ class ComputeObsRegionalTimeSeriesSubtask(AnalysisTask):
 
     def __init__(self, parentTask, regionGroup, regionName, fullSuffix,
                  obsDict):
-        # {{{
+
         """
         Construct the analysis task.
 
@@ -792,9 +824,8 @@ def __init__(self, parentTask, regionGroup, regionName, fullSuffix,
             outputDirectory, obsDict['suffix'], self.prefix)
 
         self.run_after(obsDict['maskTask'])
-        # }}}
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Compute time-series output of properties in an ocean region.
         """
@@ -951,10 +982,6 @@ def run_task(self):  # {{{
         dsOut['year'] = ('Time', numpy.ones(ds.sizes[tDim]))
         write_netcdf(dsOut, outFileName)
 
-        # }}}
-
-    # }}}
-
 
 class PlotRegionTimeSeriesSubtask(AnalysisTask):
     """
@@ -974,7 +1001,7 @@ class PlotRegionTimeSeriesSubtask(AnalysisTask):
     sectionName : str
         The section of the config file to get options from
 
-    controlConfig : ``MpasAnalysisConfigParser``
+    controlConfig : mpas_tools.config.MpasConfigParser
         The configuration options for the control run (if any)
 
     """
@@ -985,7 +1012,7 @@ class PlotRegionTimeSeriesSubtask(AnalysisTask):
     def __init__(self, parentTask, regionGroup, regionName, regionIndex,
                  controlConfig, sectionName, fullSuffix, obsSubtasks,
                  geojsonFileName):
-        # {{{
+
         """
         Construct the analysis task.
 
@@ -1004,7 +1031,7 @@ def __init__(self, parentTask, regionGroup, regionName, regionIndex,
         regionIndex : int
             The index into the dimension ``nRegions`` of the region to plot
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
 
         sectionName : str
@@ -1044,9 +1071,7 @@ def __init__(self, parentTask, regionGroup, regionName, regionIndex,
         for obsName in obsSubtasks:
             self.run_after(obsSubtasks[obsName])
 
-        # }}}
-
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
 
@@ -1065,16 +1090,16 @@ def setup_and_check(self):  # {{{
         #   self.calendar
         super(PlotRegionTimeSeriesSubtask, self).setup_and_check()
 
-        self.variables = self.config.getExpression(self.sectionName,
+        self.variables = self.config.getexpression(self.sectionName,
                                                    'variables')
 
         self.xmlFileNames = []
         for var in self.variables:
             self.xmlFileNames.append('{}/{}_{}.xml'.format(
                 self.plotsDirectory, self.prefix, var['name']))
-        return  # }}}
+        return
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Plots time-series output of properties in an ocean region.
         """
@@ -1132,7 +1157,7 @@ def run_task(self):  # {{{
             zboundsRef = dsRef.zbounds.values
 
         mainRunName = config.get('runs', 'mainRunName')
-        movingAverageMonths = 1
+        movingAveragePoints = 1
 
         self.logger.info('  Make plots...')
 
@@ -1216,7 +1241,7 @@ def run_task(self):  # {{{
 
             fig = timeseries_analysis_plot(
                 config, fields, calendar=calendar, title=title, xlabel=xLabel,
-                ylabel=yLabel, movingAveragePoints=movingAverageMonths,
+                ylabel=yLabel, movingAveragePoints=movingAveragePoints,
                 lineColors=lineColors, lineWidths=lineWidths,
                 legendText=legendText, titleFontSize=titleFontSize,
                 defaultFontSize=defaultFontSize)
@@ -1241,9 +1266,3 @@ def run_task(self):  # {{{
                 thumbnailDescription=self.regionName,
                 imageDescription=caption,
                 imageCaption=caption)
-
-        # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/ocean/time_series_ohc_anomaly.py b/mpas_analysis/ocean/time_series_ohc_anomaly.py
index cb38cd2fb..aa4f7881d 100644
--- a/mpas_analysis/ocean/time_series_ohc_anomaly.py
+++ b/mpas_analysis/ocean/time_series_ohc_anomaly.py
@@ -1,19 +1,16 @@
 # -*- coding: utf-8 -*-
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 #
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 import numpy
 import matplotlib.pyplot as plt
@@ -39,19 +36,19 @@ class TimeSeriesOHCAnomaly(AnalysisTask):
     # Xylar Asay-Davis, Milena Veneziani, Greg Streletz
 
     def __init__(self, config, mpasTimeSeriesTask, controlConfig=None):
-        # {{{
+
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasTimeSeriesTask : ``MpasTimeSeriesTask``
             The task that extracts the time series from MPAS monthly output
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -66,7 +63,7 @@ def __init__(self, config, mpasTimeSeriesTask, controlConfig=None):
             tags=['timeSeries', 'ohc', 'publicObs', 'anomaly'])
 
         sectionName = 'timeSeriesOHCAnomaly'
-        regionNames = config.getExpression(sectionName, 'regions')
+        regionNames = config.getexpression(sectionName, 'regions')
         movingAveragePoints = config.getint(sectionName, 'movingAveragePoints')
 
         self.variableDict = {}
@@ -132,14 +129,12 @@ def __init__(self, config, mpasTimeSeriesTask, controlConfig=None):
             plotTask.run_after(anomalyTask)
             self.add_subtask(plotTask)
 
-        # }}}
-
-    def _compute_ohc(self, ds):  # {{{
-        '''
+    def _compute_ohc(self, ds):
+        """
         Compute the OHC time series.
-        '''
+        """
 
-        # regionNames = self.config.getExpression('regions', 'regions')
+        # regionNames = self.config.getexpression('regions', 'regions')
         # ds['regionNames'] = ('nOceanRegionsTmp', regionNames)
 
         # for convenience, rename the variables to simpler, shorter names
@@ -173,9 +168,7 @@ def _compute_ohc(self, ds):  # {{{
             ds.coords['depth'] = (('nVertLevels',),
                                   dsRestart.refBottomDepth.values)
 
-        return ds  # }}}
-
-    # }}}
+        return ds
 
 
 class PlotOHCAnomaly(PlotDepthIntegratedTimeSeriesSubtask):
@@ -216,6 +209,3 @@ def watts_m2_to_joules(watts_m2):
         for ytick in yticks:
             plt.plot(xlim, [0, watts_m2_to_joules(ytick)], color=color,
                      linewidth=0.5)
-
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/ocean/time_series_salinity_anomaly.py b/mpas_analysis/ocean/time_series_salinity_anomaly.py
index 36fdb75ee..7c7512b85 100644
--- a/mpas_analysis/ocean/time_series_salinity_anomaly.py
+++ b/mpas_analysis/ocean/time_series_salinity_anomaly.py
@@ -1,19 +1,16 @@
 # -*- coding: utf-8 -*-
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 #
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 from mpas_analysis.shared import AnalysisTask
 
 from mpas_analysis.ocean.compute_anomaly_subtask import ComputeAnomalySubtask
@@ -29,13 +26,13 @@ class TimeSeriesSalinityAnomaly(AnalysisTask):
     # -------
     # Xylar Asay-Davis
 
-    def __init__(self, config, mpasTimeSeriesTask):  # {{{
+    def __init__(self, config, mpasTimeSeriesTask):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  instance of MpasAnalysisConfigParser
+        config :  mpas_tools.config.MpasConfigParser
             Contains configuration options
 
         mpasTimeSeriesTask : ``MpasTimeSeriesTask``
@@ -53,7 +50,7 @@ def __init__(self, config, mpasTimeSeriesTask):  # {{{
             tags=['timeSeries', 'salinity', 'publicObs', 'anomaly'])
 
         sectionName = 'hovmollerSalinityAnomaly'
-        regionNames = config.getExpression(sectionName, 'regions')
+        regionNames = config.getexpression(sectionName, 'regions')
         movingAveragePoints = config.getint(sectionName, 'movingAveragePoints')
 
         mpasFieldName = 'timeMonthly_avg_avgValueWithinOceanLayerRegion_' \
@@ -90,9 +87,3 @@ def __init__(self, config, mpasTimeSeriesTask):  # {{{
 
             plotTask.run_after(anomalyTask)
             self.add_subtask(plotTask)
-
-        # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/ocean/time_series_ssh_anomaly.py b/mpas_analysis/ocean/time_series_ssh_anomaly.py
index b76a30957..3d5d99233 100644
--- a/mpas_analysis/ocean/time_series_ssh_anomaly.py
+++ b/mpas_analysis/ocean/time_series_ssh_anomaly.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -36,7 +36,7 @@ class TimeSeriesSSHAnomaly(AnalysisTask):
     timeSeriesFileName : str
         The name of the file where the ssh anomaly is stored
 
-    controlConfig :  mpas_analysis.configuration.MpasAnalysisConfigParser
+    controlConfig : mpas_tools.config.MpasConfigParser
         Configuration options for a control run (if one is provided)
 
     filePrefix : str
@@ -53,13 +53,13 @@ def __init__(self, config, mpasTimeSeriesTask, controlConfig):
 
         Parameters
         ----------
-        config :  mpas_analysis.configuration.MpasAnalysisConfigParser
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasTimeSeriesTask : mpas_analysis.shared.time_series.MpasTimeSeriesTask
             The task that extracts the time series from MPAS monthly output
 
-        controlConfig :  mpas_analysis.configuration.MpasAnalysisConfigParser
+        controlConfig : mpas_tools.config.MpasConfigParser
             Configuration options for a control run (if any)
         """
         # Authors
diff --git a/mpas_analysis/ocean/time_series_sst.py b/mpas_analysis/ocean/time_series_sst.py
index 56f29c80c..c4e0d61f3 100644
--- a/mpas_analysis/ocean/time_series_sst.py
+++ b/mpas_analysis/ocean/time_series_sst.py
@@ -1,17 +1,14 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 from mpas_analysis.shared import AnalysisTask
 
 from mpas_analysis.shared.plot import timeseries_analysis_plot, savefig
@@ -38,7 +35,7 @@ class TimeSeriesSST(AnalysisTask):
     mpasTimeSeriesTask : ``MpasTimeSeriesTask``
         The task that extracts the time series from MPAS monthly output
 
-    controlConfig :  ``MpasAnalysisConfigParser``
+    controlconfig : mpas_tools.config.MpasConfigParser
         Configuration options for a control run (if any)
     """
     # Authors
@@ -46,19 +43,19 @@ class TimeSeriesSST(AnalysisTask):
     # Xylar Asay-Davis, Milena Veneziani
 
     def __init__(self, config, mpasTimeSeriesTask, controlConfig=None):
-        # {{{
+
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasTimeSeriesTask : ``MpasTimeSeriesTask``
             The task that extracts the time series from MPAS monthly output
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -77,9 +74,7 @@ def __init__(self, config, mpasTimeSeriesTask, controlConfig=None):
 
         self.run_after(mpasTimeSeriesTask)
 
-        # }}}
-
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
 
@@ -114,7 +109,7 @@ def setup_and_check(self):  # {{{
         self.inputFile = self.mpasTimeSeriesTask.outputFile
 
         mainRunName = config.get('runs', 'mainRunName')
-        regions = config.getExpression('timeSeriesSST', 'regions')
+        regions = config.getexpression('timeSeriesSST', 'regions')
 
         self.xmlFileNames = []
         self.filePrefixes = {}
@@ -125,9 +120,9 @@ def setup_and_check(self):  # {{{
                                                         filePrefix))
             self.filePrefixes[region] = filePrefix
 
-        return  # }}}
+        return
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Performs analysis of the time-series output of sea-surface temperature
         (SST).
@@ -152,9 +147,9 @@ def run_task(self):  # {{{
         movingAveragePoints = config.getint('timeSeriesSST',
                                             'movingAveragePoints')
 
-        regions = config.getExpression('regions', 'regions')
-        plotTitles = config.getExpression('regions', 'plotTitles')
-        regionsToPlot = config.getExpression('timeSeriesSST', 'regions')
+        regions = config.getexpression('regions', 'regions')
+        plotTitles = config.getexpression('regions', 'plotTitles')
+        regionsToPlot = config.getexpression('timeSeriesSST', 'regions')
 
         regionIndicesToPlot = [regions.index(region) for region in
                                regionsToPlot]
@@ -297,8 +292,5 @@ def run_task(self):  # {{{
                 imageDescription=caption,
                 imageCaption=caption)
 
-        # }}}
 
 # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/ocean/time_series_temperature_anomaly.py b/mpas_analysis/ocean/time_series_temperature_anomaly.py
index 6d7febc42..637585d53 100644
--- a/mpas_analysis/ocean/time_series_temperature_anomaly.py
+++ b/mpas_analysis/ocean/time_series_temperature_anomaly.py
@@ -1,19 +1,16 @@
 # -*- coding: utf-8 -*-
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 #
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 from mpas_analysis.shared import AnalysisTask
 
 from mpas_analysis.ocean.compute_anomaly_subtask import ComputeAnomalySubtask
@@ -29,13 +26,13 @@ class TimeSeriesTemperatureAnomaly(AnalysisTask):
     # -------
     # Xylar Asay-Davis
 
-    def __init__(self, config, mpasTimeSeriesTask):  # {{{
+    def __init__(self, config, mpasTimeSeriesTask):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  instance of MpasAnalysisConfigParser
+        config :  mpas_tools.config.MpasConfigParser
             Contains configuration options
 
         mpasTimeSeriesTask : ``MpasTimeSeriesTask``
@@ -53,7 +50,7 @@ def __init__(self, config, mpasTimeSeriesTask):  # {{{
             tags=['timeSeries', 'temperature', 'publicObs', 'anomaly'])
 
         sectionName = 'hovmollerTemperatureAnomaly'
-        regionNames = config.getExpression(sectionName, 'regions')
+        regionNames = config.getexpression(sectionName, 'regions')
         movingAveragePoints = config.getint(sectionName, 'movingAveragePoints')
 
         mpasFieldName = 'timeMonthly_avg_avgValueWithinOceanLayerRegion_' \
@@ -90,9 +87,3 @@ def __init__(self, config, mpasTimeSeriesTask):  # {{{
 
             plotTask.run_after(anomalyTask)
             self.add_subtask(plotTask)
-
-        # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/ocean/time_series_transport.py b/mpas_analysis/ocean/time_series_transport.py
index 2935ee3cc..eb508613f 100644
--- a/mpas_analysis/ocean/time_series_transport.py
+++ b/mpas_analysis/ocean/time_series_transport.py
@@ -1,16 +1,13 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import os
 import xarray
 import numpy
@@ -35,26 +32,27 @@
 from mpas_analysis.shared.transects import ComputeTransectMasksSubtask
 
 
-class TimeSeriesTransport(AnalysisTask):  # {{{
+class TimeSeriesTransport(AnalysisTask):
     """
     Extract and plot time series of transport through transects on the MPAS
     mesh.
     """
+
     # Authors
     # -------
     # Xylar Asay-Davis, Stephen Price
 
     def __init__(self, config, controlConfig=None):
-        # {{{
+
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -79,7 +77,7 @@ def __init__(self, config, controlConfig=None):
 
         years = [year for year in range(startYear, endYear + 1)]
 
-        transectsToPlot = config.getExpression('timeSeriesTransport',
+        transectsToPlot = config.getexpression('timeSeriesTransport',
                                                'transectsToPlot')
         if len(transectsToPlot) == 0:
             return
@@ -113,12 +111,8 @@ def __init__(self, config, controlConfig=None):
             plotTransportSubtask.run_after(combineSubtask)
             self.add_subtask(plotTransportSubtask)
 
-        # }}}
-
-    # }}}
 
-
-class ComputeTransportSubtask(AnalysisTask):  # {{{
+class ComputeTransportSubtask(AnalysisTask):
     """
     Computes time-series of transport through transects.
 
@@ -133,12 +127,13 @@ class ComputeTransportSubtask(AnalysisTask):  # {{{
     transectsToPlot : list of str
         A list of transects to plot
     """
+
     # Authors
     # -------
     # Xylar Asay-Davis, Stephen Price
 
     def __init__(self, parentTask, startYear, endYear,
-                 masksSubtask, transectsToPlot):  # {{{
+                 masksSubtask, transectsToPlot):
         """
         Construct the analysis task.
 
@@ -180,9 +175,8 @@ def __init__(self, parentTask, startYear, endYear,
 
         self.transectsToPlot = transectsToPlot
         self.restartFileName = None
-        # }}}
 
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
 
@@ -216,9 +210,7 @@ def setup_and_check(self):  # {{{
             raise IOError('No MPAS-O restart file found: need at least one '
                           'restart file for transport calculations')
 
-        # }}}
-
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Computes time-series of transport through transects.
         """
@@ -261,8 +253,8 @@ def run_task(self):  # {{{
                 variableList.append('timeMonthly_avg_normalTransportVelocity')
             elif 'timeMonthly_avg_normalGMBolusVelocity' in dsIn:
                 variableList = variableList + \
-                    ['timeMonthly_avg_normalVelocity',
-                     'timeMonthly_avg_normalGMBolusVelocity']
+                               ['timeMonthly_avg_normalVelocity',
+                                'timeMonthly_avg_normalGMBolusVelocity']
             else:
                 self.logger.warning('Cannot compute transport velocity. '
                                     'Using advection velocity.')
@@ -393,20 +385,17 @@ def run_task(self):  # {{{
         dsOut['month'].attrs['units'] = 'months'
         write_netcdf(dsOut, outFileName)
 
-        # }}}
-
-    # }}}
 
-
-class CombineTransportSubtask(AnalysisTask):  # {{{
+class CombineTransportSubtask(AnalysisTask):
     """
     Combine individual time series into a single data set
     """
+
     # Authors
     # -------
     # Xylar Asay-Davis
 
-    def __init__(self, parentTask, startYears, endYears):  # {{{
+    def __init__(self, parentTask, startYears, endYears):
         """
         Construct the analysis task.
 
@@ -433,9 +422,8 @@ def __init__(self, parentTask, startYears, endYears):  # {{{
 
         self.startYears = startYears
         self.endYears = endYears
-        # }}}
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Combine the time series
         """
@@ -461,8 +449,6 @@ def run_task(self):  # {{{
                                        concat_dim='Time', decode_times=False)
             ds.load()
             write_netcdf(ds, outFileName)
-        # }}}
-    # }}}
 
 
 class PlotTransportSubtask(AnalysisTask):
@@ -477,17 +463,18 @@ class PlotTransportSubtask(AnalysisTask):
     transectIndex : int
         The index into the dimension ``nTransects`` of the transect to plot
 
-    controlConfig : ``MpasAnalysisConfigParser``
+    controlConfig : mpas_tools.config.MpasConfigParser
         The configuration options for the control run (if any)
 
     """
+
     # Authors
     # -------
     # Xylar Asay-Davis, Stephen Price
 
     def __init__(self, parentTask, transect, transectIndex, controlConfig,
                  transportTransectFileName):
-        # {{{
+
         """
         Construct the analysis task.
 
@@ -503,7 +490,7 @@ def __init__(self, parentTask, transect, transectIndex, controlConfig,
         transectIndex : int
             The index into the dimension ``nTransects`` of the transect to plot
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -523,9 +510,7 @@ def __init__(self, parentTask, transect, transectIndex, controlConfig,
         self.transectIndex = transectIndex
         self.controlConfig = controlConfig
 
-        # }}}
-
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
 
@@ -546,9 +531,8 @@ def setup_and_check(self):  # {{{
 
         self.xmlFileNames = ['{}/transport_{}.xml'.format(
             self.plotsDirectory, self.transect.replace(' ', '_'))]
-        # }}}
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Plots time-series output of transport through transects.
         """
@@ -602,8 +586,8 @@ def run_task(self):  # {{{
         plotControl = self.controlConfig is not None
 
         mainRunName = config.get('runs', 'mainRunName')
-        movingAverageMonths = config.getint('timeSeriesTransport',
-                                            'movingAverageMonths')
+        movingAveragePoints = config.getint('timeSeriesTransport',
+                                            'movingAveragePoints')
 
         self.logger.info('  Plotting...')
 
@@ -620,12 +604,12 @@ def run_task(self):  # {{{
         fields = [transport]
         lineColors = [config.get('timeSeries', 'mainColor')]
         lineWidths = [2.5]
-        meanString = 'mean={:.2f} $\pm$ {:.2f}'.format(trans_mean, trans_std)
+        meanString = 'mean={:.2f} $\\pm$ {:.2f}'.format(trans_mean, trans_std)
         if plotControl:
             controlRunName = self.controlConfig.get('runs', 'mainRunName')
             ref_transport, ref_mean, ref_std = \
                 self._load_transport(self.controlConfig)
-            refMeanString = 'mean={:.2f} $\pm$ {:.2f}'.format(ref_mean, ref_std)
+            refMeanString = f'mean={ref_mean:.2f} $\\pm$ {ref_std:.2f}'
             fields.append(ref_transport)
             lineColors.append(config.get('timeSeries', 'controlColor'))
             lineWidths.append(1.2)
@@ -651,7 +635,7 @@ def run_task(self):  # {{{
         fig = timeseries_analysis_plot(config, fields, calendar=calendar,
                                        title=title, xlabel=xLabel,
                                        ylabel=yLabel,
-                                       movingAveragePoints=movingAverageMonths,
+                                       movingAveragePoints=movingAveragePoints,
                                        lineColors=lineColors,
                                        lineWidths=lineWidths,
                                        legendText=legendText,
@@ -660,12 +644,11 @@ def run_task(self):  # {{{
 
         if bounds is not None:
             t = transport.Time.values
-            plt.gca().fill_between(t, bounds[0]*numpy.ones_like(t),
-                                   bounds[1]*numpy.ones_like(t), alpha=0.3,
+            plt.gca().fill_between(t, bounds[0] * numpy.ones_like(t),
+                                   bounds[1] * numpy.ones_like(t), alpha=0.3,
                                    label='observations')
             plt.legend(loc='lower left')
 
-
         # do this before the inset because otherwise it moves the inset
         # and cartopy doesn't play too well with tight_layout anyway
         plt.tight_layout()
@@ -685,9 +668,8 @@ def run_task(self):  # {{{
             thumbnailDescription=thumbnailDescription,
             imageDescription=caption,
             imageCaption=caption)
-        # }}}
 
-    def _load_transport(self, config):  # {{{
+    def _load_transport(self, config):
         """
         Reads transport time series for this transect
         """
@@ -708,8 +690,4 @@ def _load_transport(self, config):  # {{{
         transport = dsIn.transport.isel(nTransects=self.transectIndex)
         mean = transport.mean().values
         std = transport.std().values
-        return transport, mean, std  # }}}
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return transport, mean, std
diff --git a/mpas_analysis/ocean/utility.py b/mpas_analysis/ocean/utility.py
index 9d59b3643..858fb1a23 100644
--- a/mpas_analysis/ocean/utility.py
+++ b/mpas_analysis/ocean/utility.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -15,14 +15,11 @@
 # -------
 # Xylar Asay-Davis
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import numpy
 import xarray
 
 
-def compute_zmid(bottomDepth, maxLevelCell, layerThickness):  # {{{
+def compute_zmid(bottomDepth, maxLevelCell, layerThickness):
     """
     Computes zMid given data arrays for bottomDepth, maxLevelCell and
     layerThickness
@@ -64,15 +61,13 @@ def compute_zmid(bottomDepth, maxLevelCell, layerThickness):  # {{{
 
     zMid = zLayerBot + 0.5 * layerThickness
 
-    return zMid  # }}}
+    return zMid
 
 
-def nans_to_numpy_mask(field):  # {{{
+def nans_to_numpy_mask(field):
     """
     Convert a numpy array with NaNs to a masked numpy array
     """
     field = numpy.ma.masked_array(
         field, numpy.isnan(field))
-    return field  # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+    return field
diff --git a/mpas_analysis/ocean/woce_transects.py b/mpas_analysis/ocean/woce_transects.py
index f19c7d4b3..c7b6b54b8 100644
--- a/mpas_analysis/ocean/woce_transects.py
+++ b/mpas_analysis/ocean/woce_transects.py
@@ -1,16 +1,13 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 from mpas_analysis.shared import AnalysisTask
 from mpas_analysis.ocean.compute_transects_subtask import \
     ComputeTransectsSubtask, TransectsObservations
@@ -22,7 +19,7 @@
 from collections import OrderedDict
 
 
-class WoceTransects(AnalysisTask):  # {{{
+class WoceTransects(AnalysisTask):
     """
     Plot model output at WOCE transects and compare it against WOCE
     observations
@@ -32,24 +29,22 @@ class WoceTransects(AnalysisTask):  # {{{
     # Xylar Asay-Davis
 
     def __init__(self, config, mpasClimatologyTask, controlConfig=None):
-
-        # {{{
-        '''
+        """
         Construct the analysis task and adds it as a subtask of the
         ``parentTask``.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
             The task that produced the climatology to be remapped and plotted
             as a transect
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -64,7 +59,7 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):
 
         sectionName = self.taskName
 
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         horizontalResolution = config.get(sectionName, 'horizontalResolution')
 
@@ -74,25 +69,33 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):
         if verticalComparisonGridName in ['mpas', 'obs']:
             verticalComparisonGrid = None
         else:
-            verticalComparisonGrid = config.getExpression(
-                sectionName, 'verticalComparisonGrid', usenumpyfunc=True)
+            verticalComparisonGrid = config.getexpression(
+                sectionName, 'verticalComparisonGrid', use_numpyfunc=True)
 
-        verticalBounds = config.getExpression(sectionName, 'verticalBounds')
+        verticalBounds = config.getexpression(sectionName, 'verticalBounds')
 
-        horizontalBounds = config.getExpression(
+        horizontalBounds = config.getexpression(
             sectionName, 'horizontalBounds')
 
         observationsDirectory = build_obs_path(
             config, 'ocean', 'woceSubdirectory')
 
-        obsFileNames = OrderedDict()
-
-        obsFileNames['WOCE_A21'] = \
-            'WOCE_A21_Drake_Passage_20181126.nc'
-        obsFileNames['WOCE_A23'] = \
-            'WOCE_A23_South_Atlantic_20181126.nc'
-        obsFileNames['WOCE_A12'] = \
-            'WOCE_A12_Prime_Meridian_20181126.nc'
+        origObsFileNames = \
+            {'WOCE_A21': 'WOCE_A21_Drake_Passage_20181126.nc',
+             'WOCE_A23': 'WOCE_A23_South_Atlantic_20181126.nc',
+             'WOCE_A12': 'WOCE_A12_Prime_Meridian_20181126.nc'}
+
+        obsFileNames = {}
+        for transectName in horizontalBounds:
+            found = False
+            for name in origObsFileNames:
+                if transectName.startswith(name):
+                    obsFileNames[transectName] = origObsFileNames[name]
+                    found = True
+                    break
+            if not found:
+                raise ValueError(f'Keys for horizontalBounds must start '
+                                 f'with one of {list(origObsFileNames)}')
 
         for transectName in obsFileNames:
             fileName = '{}/{}'.format(observationsDirectory,
@@ -114,12 +117,17 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):
                 {'mpas': 'timeMonthly_avg_potentialDensity',
                  'obs': 'potentialDensity',
                  'titleName': 'Potential Density',
-                 'units': r'kg m$^{-3}$'}}
+                 'units': r'kg m$^{-3}$'},
+             'potentialDensityContour':
+                 {'mpas': 'timeMonthly_avg_potentialDensity',
+                  'obs': 'potentialDensity',
+                  'titleName': 'Potential Density Contours',
+                  'units': r'kg m$^{-3}$'}}
 
         transectCollectionName = 'WOCE_transects'
         if horizontalResolution not in ['obs', 'mpas']:
-            transectCollectionName = '{}_{}km'.format(transectCollectionName,
-                                                      horizontalResolution)
+            transectCollectionName = \
+                f'{transectCollectionName}_{horizontalResolution}km'
 
         transectsObservations = TransectsObservations(config, obsFileNames,
                                                       horizontalResolution,
@@ -145,13 +153,15 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):
 
         else:
             controlRunName = controlConfig.get('runs', 'mainRunName')
-            refTitleLabel = 'Control: {}'.format(controlRunName)
+            refTitleLabel = f'Control: {controlRunName}'
 
             diffTitleLabel = 'Main - Control'
 
         fieldNameDict = {'temperature': 'temperatureTransect',
                          'salinity': 'salinityTransect',
-                         'potentialDensity': 'potentialDensityTransect'}
+                         'potentialDensity': 'potentialDensityTransect',
+                         'potentialDensityContour':
+                             'potentialDensityContourTransect'}
 
         for fieldName in fields:
             for transectName in obsFileNames:
@@ -164,9 +174,8 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):
 
                     fieldNameUpper = fieldName[0].upper() + fieldName[1:]
                     titleName = fields[fieldName]['titleName']
-                    fieldNameInTytle = '{} from {}'.format(
-                        titleName,
-                        transectName.replace('_', ' '))
+                    fieldNameInTitle = \
+                        f'{titleName} from {transectName.replace("_", " ")}'
 
                     # make a new subtask for this season and comparison grid
                     subtask = PlotTransectSubtask(
@@ -176,26 +185,18 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):
 
                     subtask.set_plot_info(
                         outFileLabel=outFileLabel,
-                        fieldNameInTitle=fieldNameInTytle,
+                        fieldNameInTitle=fieldNameInTitle,
                         mpasFieldName=fields[fieldName]['mpas'],
                         refFieldName=refFieldName,
                         refTitleLabel=refTitleLabel,
                         diffTitleLabel=diffTitleLabel,
                         unitsLabel=fields[fieldName]['units'],
-                        imageCaption='{} {}'.format(fieldNameInTytle,
-                                                    season),
+                        imageCaption=f'{fieldNameInTitle} {season}',
                         galleryGroup='WOCE Transects',
                         groupSubtitle=None,
                         groupLink='woce',
                         galleryName=titleName,
-                        configSectionName='woce{}Transects'.format(
-                            fieldNameUpper),
+                        configSectionName=f'woce{fieldNameUpper}Transects',
                         verticalBounds=verticalBounds)
 
                     self.add_subtask(subtask)
-        # }}}
-
-    # }}}
-
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/polar_regions.cfg b/mpas_analysis/polar_regions.cfg
index c8aa4abd3..1478dc155 100644
--- a/mpas_analysis/polar_regions.cfg
+++ b/mpas_analysis/polar_regions.cfg
@@ -148,6 +148,11 @@ verticalComparisonGridName = mpas
 # A range for the y axis (if any)
 verticalBounds = [-1500., 0.]
 
+# a list of fields top plot for each transect.
+fieldList = ['temperature', 'salinity', 'potentialDensity', 'zonalVelocity',
+             'meridionalVelocity', 'velocityMagnitude',
+             'potentialDensityContour']
+
 
 [soseTemperatureTransects]
 # options related to plotting SOSE transects of potential temperature
@@ -209,9 +214,12 @@ verticalComparisonGridName = mpas
 # Horizontal bounds of the plot (in km), or an empty list for automatic bounds
 # The bounds are a 2-element list of the minimum and maximum distance along the
 # transect
-horizontalBounds = {'WOCE_A21': [630., 830.],
-                    'WOCE_A23': [0., 200.],
-                    'WOCE_A12': [4620., 4820.]}
+horizontalBounds = {'WOCE_A21': [],
+                    'WOCE_A23': [],
+                    'WOCE_A12': [],
+                    'WOCE_A21_zoom': [630., 830.],
+                    'WOCE_A23_zoom': [0., 200.],
+                    'WOCE_A12_zoom': [4620., 4820.]}
 
 # A range for the y axis (if any)
 verticalBounds = [-4000., 0.]
@@ -347,9 +355,9 @@ regionNames = ["Southern Ocean 60S", "Weddell Sea Shelf",
 computeAnomaly = False
 
 # Number of points over which to compute moving average(e.g., for monthly
-# output, movingAverageMonths=12 corresponds to a 12-month moving average
+# output, movingAveragePoints=12 corresponds to a 12-month moving average
 # window)
-movingAverageMonths = 12
+movingAveragePoints = 12
 
 
 [hovmollerOceanRegionsPotentialTemperature]
@@ -361,7 +369,7 @@ normArgsResult = {'vmin': -2., 'vmax': 3.}
 normArgsDifference = {'vmin': -2., 'vmax': 2.}
 
 # Number of months over which to compute moving average
-movingAverageMonths = 12
+movingAveragePoints = 12
 
 # limits on depth, the full range by default
 yLim = [-600., -5.]
@@ -375,7 +383,7 @@ normArgsResult = {'vmin': 33., 'vmax': 35.}
 normArgsDifference = {'vmin': -0.5, 'vmax': 0.5}
 
 # Number of months over which to compute moving average
-movingAverageMonths = 12
+movingAveragePoints = 12
 
 # limits on depth, the full range by default
 yLim = [-600., -5.]
@@ -390,7 +398,7 @@ normArgsResult = {'vmin': 1026.5, 'vmax': 1028.}
 normArgsDifference = {'vmin': -0.3, 'vmax': 0.3}
 
 # Number of months over which to compute moving average
-movingAverageMonths = 12
+movingAveragePoints = 12
 
 # limits on depth, the full range by default
 yLim = [-600., -5.]
diff --git a/mpas_analysis/sea_ice/climatology_map_berg_conc.py b/mpas_analysis/sea_ice/climatology_map_berg_conc.py
index 5604bec46..4987de19f 100644
--- a/mpas_analysis/sea_ice/climatology_map_berg_conc.py
+++ b/mpas_analysis/sea_ice/climatology_map_berg_conc.py
@@ -6,9 +6,6 @@
 # distributed with this code, or at http://mpas-dev.github.com/license.html
 #
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 from pyremap import LatLonGridDescriptor
 
@@ -23,7 +20,7 @@
 from mpas_analysis.shared.io.utility import build_obs_path
 
 
-class ClimatologyMapIcebergConc(AnalysisTask):  # {{{
+class ClimatologyMapIcebergConc(AnalysisTask):
     """
     An analysis task for comparison of iceberg concentration against
     observations
@@ -33,13 +30,13 @@ class ClimatologyMapIcebergConc(AnalysisTask):  # {{{
     # Darin Comeau, Xylar Asay-Davis
 
     def __init__(self, config, mpasClimatologyTask, hemisphere,
-                 controlConfig=None):  # {{{
+                 controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
@@ -48,7 +45,7 @@ def __init__(self, config, mpasClimatologyTask, hemisphere,
         hemisphere : {'NH', 'SH'}
             The hemisphere to plot
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -82,13 +79,13 @@ def __init__(self, config, mpasClimatologyTask, hemisphere,
             hemisphereLong = 'Southern'
 
         # read in what seasons we want to plot
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         if len(seasons) == 0:
             raise ValueError('config section {} does not contain valid list '
                              'of seasons'.format(sectionName))
 
-        comparisonGridNames = config.getExpression(sectionName,
+        comparisonGridNames = config.getexpression(sectionName,
                                                    'comparisonGrids')
 
         if len(comparisonGridNames) == 0:
@@ -166,12 +163,8 @@ def __init__(self, config, mpasClimatologyTask, hemisphere,
 
                 self.add_subtask(subtask)
 
-        # }}}
-
-    # }}}
-
 
-class RemapAltibergConcClimatology(RemapObservedClimatologySubtask):  # {{{
+class RemapAltibergConcClimatology(RemapObservedClimatologySubtask):
     """
     A subtask for reading and remapping iceberg concentration from Altiberg
     observations
@@ -180,7 +173,7 @@ class RemapAltibergConcClimatology(RemapObservedClimatologySubtask):  # {{{
     # -------
     # Darin Comeau, Xylar Asay-Davis
 
-    def get_observation_descriptor(self, fileName):  # {{{
+    def get_observation_descriptor(self, fileName):
         """
         get a MeshDescriptor for the observation grid
 
@@ -203,9 +196,9 @@ def get_observation_descriptor(self, fileName):  # {{{
         obsDescriptor = LatLonGridDescriptor.read(fileName=fileName,
                                                   latVarName='latitude',
                                                   lonVarName='longitude')
-        return obsDescriptor  # }}}
+        return obsDescriptor
 
-    def build_observational_dataset(self, fileName):  # {{{
+    def build_observational_dataset(self, fileName):
         """
         read in the data sets for observations, and possibly rename some
         variables and dimensions
@@ -230,8 +223,4 @@ def build_observational_dataset(self, fileName):  # {{{
         dsObs.coords['year'] = dsObs['Time.year']
         dsObs = dsObs.transpose('Time', 'latitude', 'longitude')
 
-        return dsObs  # }}}
-    # }}}
-
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return dsObs
diff --git a/mpas_analysis/sea_ice/climatology_map_sea_ice_conc.py b/mpas_analysis/sea_ice/climatology_map_sea_ice_conc.py
index ff156f45f..149c9195e 100644
--- a/mpas_analysis/sea_ice/climatology_map_sea_ice_conc.py
+++ b/mpas_analysis/sea_ice/climatology_map_sea_ice_conc.py
@@ -1,17 +1,14 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 from pyremap import LatLonGridDescriptor
 
@@ -26,7 +23,7 @@
 from mpas_analysis.shared.io.utility import build_obs_path
 
 
-class ClimatologyMapSeaIceConc(AnalysisTask):  # {{{
+class ClimatologyMapSeaIceConc(AnalysisTask):
     """
     An analysis task for comparison of sea ice concentration against
     observations
@@ -36,13 +33,13 @@ class ClimatologyMapSeaIceConc(AnalysisTask):  # {{{
     # Luke Van Roekel, Xylar Asay-Davis, Milena Veneziani
 
     def __init__(self, config, mpasClimatologyTask, hemisphere,
-                 controlConfig=None):  # {{{
+                 controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
@@ -51,7 +48,7 @@ def __init__(self, config, mpasClimatologyTask, hemisphere,
         hemisphere : {'NH', 'SH'}
             The hemisphere to plot
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -85,13 +82,13 @@ def __init__(self, config, mpasClimatologyTask, hemisphere,
             hemisphereLong = 'Southern'
 
         # read in what seasons we want to plot
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         if len(seasons) == 0:
             raise ValueError('config section {} does not contain valid list '
                              'of seasons'.format(sectionName))
 
-        comparisonGridNames = config.getExpression(sectionName,
+        comparisonGridNames = config.getexpression(sectionName,
                                                    'comparisonGrids')
 
         if len(comparisonGridNames) == 0:
@@ -118,16 +115,15 @@ def __init__(self, config, mpasClimatologyTask, hemisphere,
                                 hemisphereLong, remapClimatologySubtask,
                                 controlConfig, mpasFieldName,
                                 fieldName, iselValues)
-        # }}}
 
     def _add_obs_tasks(self, seasons, comparisonGridNames, hemisphere,
                        hemisphereLong, remapClimatologySubtask,
-                       mpasFieldName):  # {{{
+                       mpasFieldName):
         config = self.config
         obsFieldName = 'seaIceConc'
         sectionName = self.taskName
 
-        observationPrefixes = config.getExpression(sectionName,
+        observationPrefixes = config.getexpression(sectionName,
                                                    'observationPrefixes')
         for prefix in observationPrefixes:
             for season in seasons:
@@ -186,12 +182,11 @@ def _add_obs_tasks(self, seasons, comparisonGridNames, hemisphere,
                             prefix))
 
                     self.add_subtask(subtask)
-        # }}}
 
     def _add_ref_tasks(self, seasons, comparisonGridNames, hemisphere,
                        hemisphereLong, remapClimatologySubtask,
                        controlConfig, mpasFieldName, fieldName,
-                       iselValues):  # {{{
+                       iselValues):
 
         controlRunName = controlConfig.get('runs', 'mainRunName')
         galleryName = None
@@ -229,11 +224,9 @@ def _add_ref_tasks(self, seasons, comparisonGridNames, hemisphere,
                     galleryName=galleryName)
 
                 self.add_subtask(subtask)
-        # }}}
-    # }}}
 
 
-class RemapObservedConcClimatology(RemapObservedClimatologySubtask):  # {{{
+class RemapObservedConcClimatology(RemapObservedClimatologySubtask):
     """
     A subtask for reading and remapping sea ice concentration observations
     """
@@ -241,8 +234,8 @@ class RemapObservedConcClimatology(RemapObservedClimatologySubtask):  # {{{
     # -------
     # Xylar Asay-Davis
 
-    def get_observation_descriptor(self, fileName):  # {{{
-        '''
+    def get_observation_descriptor(self, fileName):
+        """
         get a MeshDescriptor for the observation grid
 
         Parameters
@@ -254,7 +247,7 @@ def get_observation_descriptor(self, fileName):  # {{{
         -------
         obsDescriptor : ``MeshDescriptor``
             The descriptor for the observation grid
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -264,10 +257,10 @@ def get_observation_descriptor(self, fileName):  # {{{
         obsDescriptor = LatLonGridDescriptor.read(fileName=fileName,
                                                   latVarName='t_lat',
                                                   lonVarName='t_lon')
-        return obsDescriptor  # }}}
+        return obsDescriptor
 
-    def build_observational_dataset(self, fileName):  # {{{
-        '''
+    def build_observational_dataset(self, fileName):
+        """
         read in the data sets for observations, and possibly rename some
         variables and dimensions
 
@@ -280,7 +273,7 @@ def build_observational_dataset(self, fileName):  # {{{
         -------
         dsObs : ``xarray.Dataset``
             The observational dataset
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -288,8 +281,3 @@ def build_observational_dataset(self, fileName):  # {{{
         dsObs = xr.open_dataset(fileName)
         dsObs = dsObs.rename({'AICE': 'seaIceConc'})
         return dsObs
-        # }}}
-    # }}}
-
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/sea_ice/climatology_map_sea_ice_thick.py b/mpas_analysis/sea_ice/climatology_map_sea_ice_thick.py
index f1f0a6ed9..96abc9a0d 100644
--- a/mpas_analysis/sea_ice/climatology_map_sea_ice_thick.py
+++ b/mpas_analysis/sea_ice/climatology_map_sea_ice_thick.py
@@ -1,17 +1,14 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 from pyremap import LatLonGridDescriptor
 
@@ -26,7 +23,7 @@
 from mpas_analysis.shared.io.utility import build_obs_path
 
 
-class ClimatologyMapSeaIceThick(AnalysisTask):  # {{{
+class ClimatologyMapSeaIceThick(AnalysisTask):
     """
     An analysis task for comparison of sea ice thickness against
     observations
@@ -36,13 +33,13 @@ class ClimatologyMapSeaIceThick(AnalysisTask):  # {{{
     # Luke Van Roekel, Xylar Asay-Davis, Milena Veneziani
 
     def __init__(self, config, mpasClimatologyTask, hemisphere,
-                 controlConfig=None):  # {{{
+                 controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasClimatologyTask : ``MpasClimatologyTask``
@@ -51,7 +48,7 @@ def __init__(self, config, mpasClimatologyTask, hemisphere,
         hemisphere : {'NH', 'SH'}
             The hemisphere to plot
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -85,13 +82,13 @@ def __init__(self, config, mpasClimatologyTask, hemisphere,
             hemisphereLong = 'Southern'
 
         # read in what seasons we want to plot
-        seasons = config.getExpression(sectionName, 'seasons')
+        seasons = config.getexpression(sectionName, 'seasons')
 
         if len(seasons) == 0:
             raise ValueError('config section {} does not contain valid list '
                              'of seasons'.format(sectionName))
 
-        comparisonGridNames = config.getExpression(sectionName,
+        comparisonGridNames = config.getexpression(sectionName,
                                                    'comparisonGrids')
 
         if len(comparisonGridNames) == 0:
@@ -174,12 +171,8 @@ def __init__(self, config, mpasClimatologyTask, hemisphere,
 
                 self.add_subtask(subtask)
 
-        # }}}
-
-    # }}}
-
 
-class RemapObservedThickClimatology(RemapObservedClimatologySubtask):  # {{{
+class RemapObservedThickClimatology(RemapObservedClimatologySubtask):
     """
     A subtask for reading and remapping sea ice thickness observations
     """
@@ -187,8 +180,8 @@ class RemapObservedThickClimatology(RemapObservedClimatologySubtask):  # {{{
     # -------
     # Xylar Asay-Davis
 
-    def get_observation_descriptor(self, fileName):  # {{{
-        '''
+    def get_observation_descriptor(self, fileName):
+        """
         get a MeshDescriptor for the observation grid
 
         Parameters
@@ -200,7 +193,7 @@ def get_observation_descriptor(self, fileName):  # {{{
         -------
         obsDescriptor : ``MeshDescriptor``
             The descriptor for the observation grid
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -210,10 +203,10 @@ def get_observation_descriptor(self, fileName):  # {{{
         obsDescriptor = LatLonGridDescriptor.read(fileName=fileName,
                                                   latVarName='t_lat',
                                                   lonVarName='t_lon')
-        return obsDescriptor  # }}}
+        return obsDescriptor
 
-    def build_observational_dataset(self, fileName):  # {{{
-        '''
+    def build_observational_dataset(self, fileName):
+        """
         read in the data sets for observations, and possibly rename some
         variables and dimensions
 
@@ -226,7 +219,7 @@ def build_observational_dataset(self, fileName):  # {{{
         -------
         dsObs : ``xarray.Dataset``
             The observational dataset
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -234,8 +227,3 @@ def build_observational_dataset(self, fileName):  # {{{
         dsObs = xr.open_dataset(fileName)
         dsObs = dsObs.rename({'HI': 'seaIceThick'})
         return dsObs
-        # }}}
-    # }}}
-
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/sea_ice/plot_climatology_map_subtask.py b/mpas_analysis/sea_ice/plot_climatology_map_subtask.py
index 955286c4a..374713cfb 100644
--- a/mpas_analysis/sea_ice/plot_climatology_map_subtask.py
+++ b/mpas_analysis/sea_ice/plot_climatology_map_subtask.py
@@ -1,17 +1,14 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import numpy.ma as ma
 import numpy as np
 
@@ -27,7 +24,7 @@
     get_remapped_mpas_climatology_file_name
 
 
-class PlotClimatologyMapSubtask(AnalysisTask):  # {{{
+class PlotClimatologyMapSubtask(AnalysisTask):
     """
     An analysis task for plotting 2D model fields against observations or a
     control run.
@@ -52,7 +49,7 @@ class PlotClimatologyMapSubtask(AnalysisTask):  # {{{
         The subtask for remapping the observational climatology that this
         subtask will plot
 
-    controlConfig :  ``MpasAnalysisConfigParser``
+    controlconfig : mpas_tools.config.MpasConfigParser
         Configuration options for a control run (if any)
 
     outFileLabel : str
@@ -100,8 +97,8 @@ class PlotClimatologyMapSubtask(AnalysisTask):  # {{{
     def __init__(self, parentTask, hemisphere, season, comparisonGridName,
                  remapMpasClimatologySubtask, remapObsClimatologySubtask=None,
                  controlConfig=None, subtaskSuffix=None):
-        # {{{
-        '''
+
+        """
         Construct one analysis subtask for each plot (i.e. each season and
         comparison grid) and a subtask for computing climatologies.
 
@@ -128,13 +125,13 @@ def __init__(self, parentTask, hemisphere, season, comparisonGridName,
             The subtask for remapping the observational climatology that this
             subtask will plot
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
 
         subtaskSuffix : str, optional
             A suffix on the subtask to ensure that it is unique (e.g. the
             observations being plotted)
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -164,13 +161,12 @@ def __init__(self, parentTask, hemisphere, season, comparisonGridName,
         self.run_after(remapMpasClimatologySubtask)
         if remapObsClimatologySubtask is not None:
             self.run_after(remapObsClimatologySubtask)
-        # }}}
 
     def set_plot_info(self, outFileLabel, fieldNameInTitle, mpasFieldName,
                       refFieldName, refTitleLabel, diffTitleLabel, unitsLabel,
                       imageDescription, imageCaption, galleryGroup,
                       groupSubtitle, groupLink, galleryName, maskValue=None):
-        # {{{
+
         """
         Store attributes related to plots, plot file names and HTML output.
 
@@ -241,9 +237,8 @@ def set_plot_info(self, outFileLabel, fieldNameInTitle, mpasFieldName,
         self.galleryName = galleryName
 
         self.maskValue = maskValue
-        # }}}
 
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
         """
@@ -271,9 +266,7 @@ def setup_and_check(self):  # {{{
         self.xmlFileNames.append('{}/{}.xml'.format(self.plotsDirectory,
                                                     self.filePrefix))
 
-        # }}}
-
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Performs analysis of sea-ice properties by comparing with
         previous model results and/or observations.
@@ -374,7 +367,7 @@ def run_task(self):  # {{{
         # for log plots, make sure the data is all positive to avoid masking
         if config.has_option(sectionName, 'normTypeResult'):
             normType = config.get(sectionName, 'normTypeResult')
-            normArgs = config.getExpression(sectionName, 'normArgsResult')
+            normArgs = config.getexpression(sectionName, 'normArgsResult')
             if normType == 'log':
                 epsilon = 1e-2 * normArgs['vmin']
                 modelOutput = np.maximum(modelOutput, epsilon)
@@ -418,7 +411,3 @@ def run_task(self):  # {{{
             thumbnailDescription=season,
             imageDescription=self.imageDescription,
             imageCaption=self.imageCaption)
-        # }}}
-
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/sea_ice/time_series.py b/mpas_analysis/sea_ice/time_series.py
index 3bc881a38..2b48d5304 100644
--- a/mpas_analysis/sea_ice/time_series.py
+++ b/mpas_analysis/sea_ice/time_series.py
@@ -1,17 +1,14 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 
 from mpas_analysis.shared import AnalysisTask
@@ -43,7 +40,7 @@ class TimeSeriesSeaIce(AnalysisTask):
     mpasTimeSeriesTask : ``MpasTimeSeriesTask``
         The task that extracts the time series from MPAS monthly output
 
-    controlConfig :  ``MpasAnalysisConfigParser``
+    controlconfig : mpas_tools.config.MpasConfigParser
         Configuration options for a control run (if any)
 
     """
@@ -52,19 +49,19 @@ class TimeSeriesSeaIce(AnalysisTask):
     # Xylar Asay-Davis, Milena Veneziani
 
     def __init__(self, config, mpasTimeSeriesTask,
-                 controlConfig=None):  # {{{
+                 controlConfig=None):
         """
         Construct the analysis task.
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         mpasTimeSeriesTask : ``MpasTimeSeriesTask``
             The task that extracts the time series from MPAS monthly output
 
-        controlConfig :  ``MpasAnalysisConfigParser``, optional
+        controlconfig : mpas_tools.config.MpasConfigParser, optional
             Configuration options for a control run (if any)
         """
         # Authors
@@ -83,9 +80,7 @@ def __init__(self, config, mpasTimeSeriesTask,
 
         self.run_after(mpasTimeSeriesTask)
 
-        # }}}
-
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
 
@@ -183,9 +178,9 @@ def setup_and_check(self):  # {{{
 
         if polarPlot:
             self.xmlFileNames.extend(polarXMLFileNames)
-        return  # }}}
+        return
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Performs analysis of time series of sea-ice properties.
         """
@@ -515,9 +510,8 @@ def run_task(self):  # {{{
                         thumbnailDescription=thumbnailDescription,
                         imageDescription=caption,
                         imageCaption=caption)
-        # }}}
 
-    def _replicate_cycle(self, ds, dsToReplicate, calendar):  # {{{
+    def _replicate_cycle(self, ds, dsToReplicate, calendar):
         """
         Replicates a periodic time series `dsToReplicate` to cover the
         timeframe of the dataset `ds`.
@@ -585,13 +579,13 @@ def _replicate_cycle(self, ds, dsToReplicate, calendar):  # {{{
                                      method=str('nearest')).values
         dsShift = dsShift.sel(Time=slice(dsStartTime, dsEndTime))
 
-        return dsShift  # }}}
+        return dsShift
 
-    def _compute_area_vol(self):  # {{{
-        '''
+    def _compute_area_vol(self):
+        """
         Compute part of the time series of sea ice volume and area, given time
         indices to process.
-        '''
+        """
 
         outFileNames = {}
         for hemisphere in ['NH', 'SH']:
@@ -643,7 +637,4 @@ def _compute_area_vol(self):  # {{{
 
             write_netcdf(dsAreaSum, outFileNames[hemisphere])
 
-        return dsTimeSeries  # }}}
-
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        return dsTimeSeries
diff --git a/mpas_analysis/shared/analysis_task.py b/mpas_analysis/shared/analysis_task.py
index 031a61993..02a8547a5 100644
--- a/mpas_analysis/shared/analysis_task.py
+++ b/mpas_analysis/shared/analysis_task.py
@@ -1,23 +1,20 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-'''
+"""
 Defines the base class for analysis tasks.
-'''
+"""
 # Authors
 # -------
 # Xylar Asay-Davis
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 from multiprocessing import Process, Value
 import time
 import traceback
@@ -29,13 +26,13 @@
     make_directories, get_files_year_month
 
 
-class AnalysisTask(Process):  # {{{
-    '''
+class AnalysisTask(Process):
+    """
     The base class for analysis tasks.
 
     Attributes
     ----------
-    config : ``MpasAnalysisConfigParser``
+    config : mpas_tools.config.MpasConfigParser
         Contains configuration options
 
     taskName : str
@@ -88,7 +85,7 @@ class AnalysisTask(Process):  # {{{
 
     logger : ``logging.Logger``
         A logger for output during the run phase of an analysis task
-    '''
+    """
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -102,8 +99,8 @@ class AnalysisTask(Process):  # {{{
     FAIL = 5
 
     def __init__(self, config, taskName, componentName, tags=[],
-                 subtaskName=None):  # {{{
-        '''
+                 subtaskName=None):
+        """
         Construct the analysis task.
 
         Individual tasks (children classes of this base class) should first
@@ -112,7 +109,7 @@ def __init__(self, config, taskName, componentName, tags=[],
 
         Parameters
         ----------
-        config :  instance of MpasAnalysisConfigParser
+        config :  mpas_tools.config.MpasConfigParser
             Contains configuration options
 
         taskName :  str
@@ -131,7 +128,7 @@ def __init__(self, config, taskName, componentName, tags=[],
 
         subtaskName : str, optional
             If this is a subtask of ``taskName``, the name of the subtask
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -170,10 +167,9 @@ def __init__(self, config, taskName, componentName, tags=[],
         # run the task directly as opposed to launching it as a new process
         # even in parallel because it has subprocesses such as Pools
         self.runDirectly = False
-        # }}}
 
-    def setup_and_check(self):  # {{{
-        '''
+    def setup_and_check(self):
+        """
         Perform steps to set up the analysis (e.g. reading namelists and
         streams files).
 
@@ -188,7 +184,7 @@ def setup_and_check(self):  # {{{
         analysis-specific setup.  For example, this function could check if
         necessary observations and other data files are found, then, determine
         the list of files to be read when the analysis is run.
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -235,21 +231,19 @@ def setup_and_check(self):  # {{{
         self._logFileName = '{}/{}.log'.format(logsDirectory,
                                                self.fullTaskName)
 
-        # }}}
-
-    def run_task(self):  # {{{
-        '''
+    def run_task(self):
+        """
         Run the analysis.  Each task should override this function to do the
         work of computing and/or plotting analysis
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
 
-        return  # }}}
+        return
 
-    def run_after(self, task):  # {{{
-        '''
+    def run_after(self, task):
+        """
         Only run this task after the given task has completed.  This allows a
         task to be constructed of multiple subtasks, some of which may block
         later tasks, while allowing some subtasks to run in parallel.  It also
@@ -260,17 +254,16 @@ def run_after(self, task):  # {{{
         ----------
         task : ``AnalysisTask``
             The task that should finish before this one begins
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
 
         if task not in self.runAfterTasks:
             self.runAfterTasks.append(task)
-        # }}}
 
-    def add_subtask(self, subtask):  # {{{
-        '''
+    def add_subtask(self, subtask):
+        """
         Add a subtask to this tasks.  This task always runs after the subtask
         has finished.  However, this task gets set up *before* the subtask,
         so the setup of the subtask can depend on fields defined during the
@@ -280,17 +273,16 @@ def add_subtask(self, subtask):  # {{{
         ----------
         subtask : ``AnalysisTask``
             The subtask to run as part of this task
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
 
         if subtask not in self.subtasks:
             self.subtasks.append(subtask)
-        # }}}
 
-    def run(self, writeLogFile=True):  # {{{
-        '''
+    def run(self, writeLogFile=True):
+        """
         Sets up logging and then runs the analysis task.
 
         Parameters
@@ -300,7 +292,7 @@ def run(self, writeLogFile=True):  # {{{
             Otherwise, the internal logger ``self.logger`` points to stdout
             and no log file is created.  The intention is for logging to take
             place in parallel mode but not in serial mode.
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -352,11 +344,9 @@ def run(self, writeLogFile=True):  # {{{
         # writeLogFile==False)
         self.logger.handlers = []
 
-        # }}}
-
     def check_generate(self):
-        # {{{
-        '''
+
+        """
         Determines if this analysis should be generated, based on the
         ``generate`` config option and ``taskName``, ``componentName`` and
         ``tags``.
@@ -373,7 +363,7 @@ def check_generate(self):
         ------
         ValueError : If one of ``self.taskName``, ``self.componentName``
             or ``self.tags`` has not been set.
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -389,7 +379,7 @@ def check_generate(self):
                              'must be None or a list of strings.')
 
         config = self.config
-        generateList = config.getExpression('output', 'generate')
+        generateList = config.getexpression('output', 'generate')
         if len(generateList) > 0 and generateList[0][0:5] == 'only_':
             # add 'all' if the first item in the list has the 'only' prefix.
             # Otherwise, we would not run any tasks
@@ -418,11 +408,11 @@ def check_generate(self):
             elif element == self.taskName:
                 generate = True
 
-        return generate  # }}}
+        return generate
 
     def check_analysis_enabled(self, analysisOptionName, default=False,
                                raiseException=True):
-        '''
+        """
         Check to make sure a given analysis is turned on, issuing a warning or
         raising an exception if not.
 
@@ -450,7 +440,7 @@ def check_analysis_enabled(self, analysisOptionName, default=False,
             If the given analysis option is not found and ``default`` is not
             ``True`` or if the analysis option is found and is ``False``.  The
             exception is only raised if ``raiseException = True``.
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -461,12 +451,12 @@ def check_analysis_enabled(self, analysisOptionName, default=False,
         except ValueError:
             enabled = default
             if default:
-                print('Warning: namelist option {} not found.\n'
-                      'This likely indicates that the simulation you '
-                      'are analyzing was run with an\n'
-                      'older version of MPAS-O that did not support '
-                      'this flag.  Assuming enabled.'.format(
-                          analysisOptionName))
+                print(f'Warning: namelist option {analysisOptionName} not '
+                      f'found.\n'
+                      f'This likely indicates that the simulation you '
+                      f'are analyzing was run with an\n'
+                      f'older version of MPAS-O that did not support '
+                      f'this flag.  Assuming enabled.')
 
         if not enabled and raiseException:
             raise RuntimeError('*** MPAS-Analysis relies on {} = .true.\n'
@@ -475,8 +465,8 @@ def check_analysis_enabled(self, analysisOptionName, default=False,
 
         return enabled
 
-    def set_start_end_date(self, section):  # {{{
-        '''
+    def set_start_end_date(self, section):
+        """
         Set the start and end dates in the ``config`` correspond to the start
         and end years in a given category of analysis
 
@@ -486,7 +476,7 @@ def set_start_end_date(self, section):  # {{{
             The name of a section in the config file containing ``startYear``
             and ``endYear`` options. ``section`` is typically one of
             ``climatology``, ``timeSeries`` or ``index``
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -498,12 +488,13 @@ def set_start_end_date(self, section):  # {{{
         if not self.config.has_option(section, 'endDate'):
             endDate = '{:04d}-12-31_23:59:59'.format(
                 self.config.getint(section, 'endYear'))
-            self.config.set(section, 'endDate', endDate)  # }}}
+            self.config.set(section, 'endDate', endDate)
+
 
 # }}}
 
 
-class AnalysisFormatter(logging.Formatter):  # {{{
+class AnalysisFormatter(logging.Formatter):
     """
     A custom formatter for logging
 
@@ -546,10 +537,12 @@ def format(self, record):
         self._fmt = format_orig
 
         return result
+
+
 # }}}
 
 
-class StreamToLogger(object):  # {{{
+class StreamToLogger(object):
     """
     Modified based on code by:
     https://www.electricmonk.nl/log/2011/08/14/redirect-stdout-and-stderr-to-a-logger-in-python/
@@ -574,10 +567,8 @@ def write(self, buf):
     def flush(self):
         pass
 
-    # }}}
 
-
-def update_time_bounds_from_file_names(config, section, componentName):  # {{{
+def update_time_bounds_from_file_names(config, section, componentName):
     """
     Update the start and end years and dates for time series, climatologies or
     climate indices based on the years actually available in the list of files.
@@ -654,13 +645,13 @@ def update_time_bounds_from_file_names(config, section, componentName):  # {{{
 
     # search for the start of the first full year
     firstIndex = 0
-    while(firstIndex < len(years) and months[firstIndex] != 1):
+    while (firstIndex < len(years) and months[firstIndex] != 1):
         firstIndex += 1
     startYear = years[firstIndex]
 
     # search for the end of the last full year
     lastIndex = len(years) - 1
-    while(lastIndex >= 0 and months[lastIndex] != 12):
+    while (lastIndex >= 0 and months[lastIndex] != 12):
         lastIndex -= 1
     endYear = years[lastIndex]
 
@@ -692,7 +683,3 @@ def update_time_bounds_from_file_names(config, section, componentName):  # {{{
     config.set(section, 'startDate', startDate)
     endDate = '{:04d}-12-31_23:59:59'.format(endYear)
     config.set(section, 'endDate', endDate)
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/climatology/climatology.py b/mpas_analysis/shared/climatology/climatology.py
index 8770542d6..46b59ae93 100644
--- a/mpas_analysis/shared/climatology/climatology.py
+++ b/mpas_analysis/shared/climatology/climatology.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -15,9 +15,6 @@
 # -------
 # Xylar Asay-Davis
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 import os
 import numpy
@@ -38,7 +35,7 @@
 
 
 def get_remapper(config, sourceDescriptor, comparisonDescriptor,
-                 mappingFilePrefix, method, logger=None):  # {{{
+                 mappingFilePrefix, method, logger=None):
     """
     Given config options and descriptions of the source and comparison grids,
     returns a ``pyremap.Remapper`` object that can be used to remap from source
@@ -49,7 +46,7 @@ def get_remapper(config, sourceDescriptor, comparisonDescriptor,
 
     Parameters
     ----------
-    config :  instance of ``MpasAnalysisConfigParser``
+    config : mpas_tools.config.MpasConfigParser
         Contains configuration options
 
     sourceDescriptor : ``MeshDescriptor`` subclass object
@@ -96,7 +93,7 @@ def get_remapper(config, sourceDescriptor, comparisonDescriptor,
                 baseDirectoryOption='customDirectory')
 
             mappingFileName = '{}/{}'.format(mappingSubdirectory,
-                                         mappingBaseName)
+                                             mappingBaseName)
         if not tryCustom or not os.path.exists(mappingFileName):
             # second see if mapping files are in the base directory
 
@@ -120,7 +117,7 @@ def get_remapper(config, sourceDescriptor, comparisonDescriptor,
     remapper = Remapper(sourceDescriptor, comparisonDescriptor,
                         mappingFileName)
 
-    mpiTasks = config.getWithDefault('execute', 'mapMpiTasks', 1)
+    mpiTasks = config.getint('execute', 'mapMpiTasks')
     esmf_parallel_exec = config.get('execute', 'mapParallelExec')
     if esmf_parallel_exec == 'None':
         esmf_parallel_exec = None
@@ -134,10 +131,10 @@ def get_remapper(config, sourceDescriptor, comparisonDescriptor,
                                     mpiTasks=mpiTasks, tempdir=tempdir,
                                     esmf_parallel_exec=esmf_parallel_exec)
 
-    return remapper  # }}}
+    return remapper
 
 
-def compute_monthly_climatology(ds, calendar=None, maskVaries=True):  # {{{
+def compute_monthly_climatology(ds, calendar=None, maskVaries=True):
     """
     Compute monthly climatologies from a data set.  The mean is weighted but
     the number of days in each month of the data set, ignoring values masked
@@ -169,6 +166,7 @@ def compute_monthly_climatology(ds, calendar=None, maskVaries=True):  # {{{
         of ds over all months in monthValues, weighted by the number of days
         in each month.
     """
+
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -182,11 +180,11 @@ def compute_one_month_climatology(ds):
     monthlyClimatology = \
         ds.groupby('month').map(compute_one_month_climatology)
 
-    return monthlyClimatology  # }}}
+    return monthlyClimatology
 
 
 def compute_climatology(ds, monthValues, calendar=None,
-                        maskVaries=True):  # {{{
+                        maskVaries=True):
     """
     Compute a monthly, seasonal or annual climatology data set from a data
     set.  The mean is weighted but the number of days in each month of
@@ -237,11 +235,11 @@ def compute_climatology(ds, monthValues, calendar=None,
 
     climatology = _compute_masked_mean(climatologyMonths, maskVaries)
 
-    return climatology  # }}}
+    return climatology
 
 
-def add_years_months_days_in_month(ds, calendar=None):  # {{{
-    '''
+def add_years_months_days_in_month(ds, calendar=None):
+    """
     Add ``year``, ``month`` and ``daysInMonth`` as data arrays in ``ds``.
     The number of days in each month of ``ds`` is computed either using the
     ``startTime`` and ``endTime`` if available or assuming ``gregorian_noleap``
@@ -263,7 +261,7 @@ def add_years_months_days_in_month(ds, calendar=None):  # {{{
     ds : object of same type as ``ds``
         The data set with ``year``, ``month`` and ``daysInMonth`` data arrays
         added (if not already present)
-    '''
+    """
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -302,12 +300,12 @@ def add_years_months_days_in_month(ds, calendar=None):  # {{{
                  month in ds.month.values], float)
             ds.coords['daysInMonth'] = ('Time', daysInMonth)
 
-    return ds  # }}}
+    return ds
 
 
 def remap_and_write_climatology(config, climatologyDataSet,
                                 climatologyFileName, remappedFileName,
-                                remapper, logger=None):  # {{{
+                                remapper, logger=None):
     """
     Given a field in a climatology data set, use the ``remapper`` to remap
     horizontal dimensions of all fields, write the results to an output file,
@@ -320,7 +318,7 @@ def remap_and_write_climatology(config, climatologyDataSet,
 
     Parameters
     ----------
-    config :  instance of ``MpasAnalysisConfigParser``
+    config : mpas_tools.config.MpasConfigParser
         Contains configuration options
 
     climatologyDataSet : ``xarray.DataSet`` or ``xarray.DataArray`` object
@@ -381,17 +379,17 @@ def remap_and_write_climatology(config, climatologyDataSet,
             remappedClimatology = remapper.remap(climatologyDataSet,
                                                  renormalizationThreshold)
             write_netcdf(remappedClimatology, remappedFileName)
-    return remappedClimatology  # }}}
+    return remappedClimatology
 
 
-def get_unmasked_mpas_climatology_directory(config, op='avg'):  # {{{
+def get_unmasked_mpas_climatology_directory(config, op='avg'):
     """
     Get the directory for an unmasked MPAS climatology produced by ncclimo,
     making the directory if it doesn't already exist
 
     Parameters
     ----------
-    config :  ``MpasAnalysisConfigParser``
+    config : mpas_tools.config.MpasConfigParser
         configuration options
 
     op : {'avg', 'min', 'max'}
@@ -409,18 +407,17 @@ def get_unmasked_mpas_climatology_directory(config, op='avg'):  # {{{
                                         mpasMeshName)
 
     make_directories(directory)
-    return directory  # }}}
+    return directory
 
 
 def get_unmasked_mpas_climatology_file_name(config, season, componentName,
                                             op='avg'):
-    # {{{
     """
     Get the file name for an unmasked MPAS climatology produced by ncclimo
 
     Parameters
     ----------
-    config :  ``MpasAnalysisConfigParser``
+    config : mpas_tools.config.MpasConfigParser
         configuration options
 
     season : str
@@ -462,17 +459,17 @@ def get_unmasked_mpas_climatology_file_name(config, season, componentName,
         season = '{:02d}'.format(monthValues[0])
     fileName = '{}/{}_{}_{}.nc'.format(directory, ncclimoModel,
                                        season, suffix)
-    return fileName  # }}}
+    return fileName
 
 
 def get_masked_mpas_climatology_file_name(config, season, componentName,
-                                          climatologyName, op='avg'):  # {{{
+                                          climatologyName, op='avg'):
     """
     Get the file name for a masked MPAS climatology
 
     Parameters
     ----------
-    config :  ``MpasAnalysisConfigParser``
+    config : mpas_tools.config.MpasConfigParser
         Configuration options
 
     season : str
@@ -527,19 +524,19 @@ def get_masked_mpas_climatology_file_name(config, season, componentName,
     fileName = '{}/{}_{}_{}.nc'.format(
         directory, ncclimoModel, season, suffix)
 
-    return fileName  # }}}
+    return fileName
 
 
 def get_remapped_mpas_climatology_file_name(config, season, componentName,
                                             climatologyName,
                                             comparisonGridName,
-                                            op='avg'):  # {{{
+                                            op='avg'):
     """
     Get the file name for a masked MPAS climatology
 
     Parameters
     ----------
-    config :  ``MpasAnalysisConfigParser``
+    config : mpas_tools.config.MpasConfigParser
         Configuration options
 
     season : str
@@ -605,26 +602,27 @@ def get_remapped_mpas_climatology_file_name(config, season, componentName,
     fileName = '{}/{}_{}_{}.nc'.format(
         directory, ncclimoModel, season, suffix)
 
-    return fileName  # }}}
+    return fileName
 
 
 def get_climatology_op_directory(config, op='avg'):
-    '''
+    """
     Get the output directory for MPAS climatologies from output with the given
     monthly operator: avg, min or max
-    '''
+    """
     climatologyBaseDirectory = build_config_full_path(
         config, 'output', 'mpasClimatologySubdirectory')
 
     return '{}/{}'.format(climatologyBaseDirectory, op)
 
 
-def _compute_masked_mean(ds, maskVaries):  # {{{
-    '''
+def _compute_masked_mean(ds, maskVaries):
+    """
     Compute the time average of data set, masked out where the variables in ds
     are NaN and, if ``maskVaries == True``, weighting by the number of days
     used to compute each monthly mean time in ds.
-    '''
+    """
+
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -659,13 +657,13 @@ def ds_to_weights(ds):
 
         timeMean = dsWeightedSum / days.where(days > 0.)
 
-    return timeMean  # }}}
+    return timeMean
 
 
-def _matches_comparison(obsDescriptor, comparisonDescriptor):  # {{{
-    '''
+def _matches_comparison(obsDescriptor, comparisonDescriptor):
+    """
     Determine if the two meshes are the same
-    '''
+    """
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -675,12 +673,12 @@ def _matches_comparison(obsDescriptor, comparisonDescriptor):  # {{{
         # pretty hard to determine if projections are the same, so we'll rely
         # on the grid names
         match = obsDescriptor.meshName == comparisonDescriptor.meshName and \
-            len(obsDescriptor.x) == len(comparisonDescriptor.x) and \
-            len(obsDescriptor.y) == len(comparisonDescriptor.y) and \
-            numpy.all(numpy.isclose(obsDescriptor.x,
-                                    comparisonDescriptor.x)) and \
-            numpy.all(numpy.isclose(obsDescriptor.y,
-                                    comparisonDescriptor.y))
+                len(obsDescriptor.x) == len(comparisonDescriptor.x) and \
+                len(obsDescriptor.y) == len(comparisonDescriptor.y) and \
+                numpy.all(numpy.isclose(obsDescriptor.x,
+                                        comparisonDescriptor.x)) and \
+                numpy.all(numpy.isclose(obsDescriptor.y,
+                                        comparisonDescriptor.y))
     elif isinstance(obsDescriptor, LatLonGridDescriptor) and \
             isinstance(comparisonDescriptor, LatLonGridDescriptor):
         match = ((('degree' in obsDescriptor.units and
@@ -696,16 +694,16 @@ def _matches_comparison(obsDescriptor, comparisonDescriptor):  # {{{
     else:
         match = False
 
-    return match  # }}}
+    return match
 
 
 def _setup_climatology_caching(ds, startYearClimo, endYearClimo,
                                yearsPerCacheFile, cachePrefix,
-                               monthValues):  # {{{
-    '''
+                               monthValues):
+    """
     Determine which cache files already exist, which are incomplete and which
     years are present in each cache file (whether existing or to be created).
-    '''
+    """
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -760,15 +758,15 @@ def _setup_climatology_caching(ds, startYearClimo, endYearClimo,
     ds = ds.copy()
     ds.coords['cacheIndices'] = ('Time', cacheIndices)
 
-    return cacheInfo, cacheIndices  # }}}
+    return cacheInfo, cacheIndices
 
 
 def _cache_individual_climatologies(ds, cacheInfo, printProgress,
                                     yearsPerCacheFile, monthValues,
-                                    calendar):  # {{{
-    '''
+                                    calendar):
+    """
     Cache individual climatologies for later aggregation.
-    '''
+    """
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -796,15 +794,13 @@ def _cache_individual_climatologies(ds, cacheInfo, printProgress,
         write_netcdf(climatology, outputFileClimo)
         climatology.close()
 
-    # }}}
-
 
 def _cache_aggregated_climatology(startYearClimo, endYearClimo, cachePrefix,
                                   printProgress, monthValues,
-                                  cacheInfo):  # {{{
-    '''
+                                  cacheInfo):
+    """
     Cache aggregated climatology from individual climatologies.
-    '''
+    """
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -835,8 +831,8 @@ def _cache_aggregated_climatology(startYearClimo, endYearClimo, cachePrefix,
             done = True
 
         elif climatology is not None:
-            monthsIfDone = (
-                endYearClimo - startYearClimo + 1) * len(monthValues)
+            monthsIfDone = ((endYearClimo - startYearClimo + 1)
+                            * len(monthValues))
             if climatology.attrs['totalMonths'] == monthsIfDone:
                 # also complete, so we can move on
                 done = True
@@ -873,7 +869,7 @@ def _cache_aggregated_climatology(startYearClimo, endYearClimo, cachePrefix,
 
         write_netcdf(climatology, outputFileClimo)
 
-    return climatology  # }}}
+    return climatology
 
 
 def _get_year_string(startYear, endYear):
@@ -885,6 +881,3 @@ def _get_year_string(startYear, endYear):
         fileSuffix = 'years{}'.format(yearString)
 
     return yearString, fileSuffix
-
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/climatology/comparison_descriptors.py b/mpas_analysis/shared/climatology/comparison_descriptors.py
index 6ab30d4b2..726657d47 100644
--- a/mpas_analysis/shared/climatology/comparison_descriptors.py
+++ b/mpas_analysis/shared/climatology/comparison_descriptors.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -15,9 +15,6 @@
 # -------
 # Xylar Asay-Davis
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import numpy
 
 from mpas_analysis.shared.constants import constants
@@ -33,7 +30,7 @@ def get_comparison_descriptor(config, comparison_grid_name):
 
     Parameters
     ----------
-    config :  mpas_analysis.configuration.MpasAnalysisConfigParser
+    config : mpas_tools.config.MpasConfigParser
         Contains configuration options
 
     comparison_grid_name : {'latlon', 'antarctic', 'arctic', 'north_atlantic',
@@ -70,7 +67,7 @@ def _get_lat_lon_comparison_descriptor(config):
 
     Parameters
     ----------
-    config :  mpas_analysis.configuration.MpasAnalysisConfigParser
+    config : mpas_tools.config.MpasConfigParser
         Contains configuration options
 
     Returns
@@ -84,10 +81,8 @@ def _get_lat_lon_comparison_descriptor(config):
 
     section = 'climatology'
 
-    lat_res = config.getWithDefault(section, 'comparisonLatResolution',
-                                    constants.dLatitude)
-    lon_res = config.getWithDefault(section, 'comparisonLatResolution',
-                                    constants.dLongitude)
+    lat_res = config.getfloat(section, 'comparisonLatResolution')
+    lon_res = config.getfloat(section, 'comparisonLatResolution')
 
     nlat = int((constants.latmax - constants.latmin) / lat_res) + 1
     nlon = int((constants.lonmax - constants.lonmin) / lon_res) + 1
@@ -106,7 +101,7 @@ def _get_projection_comparison_descriptor(config, comparison_grid_name):
 
     Parameters
     ----------
-    config :  mpas_analysis.configuration.MpasAnalysisConfigParser
+    config : mpas_tools.config.MpasConfigParser
         Contains configuration options
 
     comparison_grid_name : str
diff --git a/mpas_analysis/shared/climatology/mpas_climatology_task.py b/mpas_analysis/shared/climatology/mpas_climatology_task.py
index 4529c2e95..64577cfb1 100644
--- a/mpas_analysis/shared/climatology/mpas_climatology_task.py
+++ b/mpas_analysis/shared/climatology/mpas_climatology_task.py
@@ -1,17 +1,14 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray
 import os
 import subprocess
@@ -21,7 +18,6 @@
 from multiprocessing.pool import ThreadPool
 import glob
 
-
 from mpas_analysis.shared.analysis_task import AnalysisTask
 
 from mpas_analysis.shared.climatology.climatology import \
@@ -37,8 +33,8 @@
 from mpas_analysis.shared.constants import constants
 
 
-class MpasClimatologyTask(AnalysisTask):  # {{{
-    '''
+class MpasClimatologyTask(AnalysisTask):
+    """
     An analysis tasks for computing climatologies from output from the
     ``timeSeriesStatsMonthly*`` analysis members.
 
@@ -78,18 +74,19 @@ class MpasClimatologyTask(AnalysisTask):  # {{{
         ``timeSeriesStatsMonthlyOutput``,
         ``timeSeriesStatsMonthlyMinOutput``,
         ``timeSeriesStatsMonthlyMaxOutput``
-    '''
+    """
+
     # Authors
     # -------
     # Xylar Asay-Davis
 
-    def __init__(self, config, componentName, taskName=None, op='avg'):  # {{{
-        '''
+    def __init__(self, config, componentName, taskName=None, op='avg'):
+        """
         Construct the analysis task.
 
         Parameters
         ----------
-        config : ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Contains configuration options
 
         componentName : {'ocean', 'seaIce'}
@@ -102,7 +99,7 @@ def __init__(self, config, componentName, taskName=None, op='avg'):  # {{{
         taskName : str, optional
             the name of the task, defaults to
             mpasClimatology<ComponentName><Op>
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -132,7 +129,7 @@ def __init__(self, config, componentName, taskName=None, op='avg'):  # {{{
 
         if taskName is None:
             suffix = componentName[0].upper() + componentName[1:] + \
-                op[0].upper() + op[1:]
+                     op[0].upper() + op[1:]
             taskName = 'mpasClimatology{}'.format(suffix)
 
         self.allVariables = None
@@ -154,7 +151,6 @@ def __init__(self, config, componentName, taskName=None, op='avg'):  # {{{
                 # running in serial
                 self.subprocessCount = 1
 
-
         self.seasonSubtasks = {}
 
         if not self.useNcclimo:
@@ -174,15 +170,14 @@ def __init__(self, config, componentName, taskName=None, op='avg'):  # {{{
                 if season in constants.abrevMonthNames:
                     continue
                 monthValues = constants.monthDictionary[season]
-                monthNames = [constants.abrevMonthNames[month-1] for month in
+                monthNames = [constants.abrevMonthNames[month - 1] for month in
                               monthValues]
                 for monthName in monthNames:
                     self.seasonSubtasks[season].run_after(
-                            self.seasonSubtasks[monthName])
-        # }}}
+                        self.seasonSubtasks[monthName])
 
-    def add_variables(self, variableList, seasons=None):  # {{{
-        '''
+    def add_variables(self, variableList, seasons=None):
+        """
         Add one or more variables and optionally one or more seasons for which
         to compute climatologies.
 
@@ -203,7 +198,7 @@ def add_variables(self, variableList, seasons=None):  # {{{
             if this funciton is called before this task has been set up (so
             the list of available variables has not yet been set) or if one
             or more of the requested variables is not available in the stream.
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -235,14 +230,12 @@ def add_variables(self, variableList, seasons=None):  # {{{
         for season in seasons:
             if season not in constants.abrevMonthNames:
                 monthValues = constants.monthDictionary[season]
-                monthNames = [constants.abrevMonthNames[month-1] for month in
+                monthNames = [constants.abrevMonthNames[month - 1] for month in
                               monthValues]
                 self.add_variables(variableList, seasons=monthNames)
 
-        # }}}
-
-    def setup_and_check(self):  # {{{
-        '''
+    def setup_and_check(self):
+        """
         Perform steps to set up the analysis and check for errors in the setup.
 
         Raises
@@ -251,7 +244,7 @@ def setup_and_check(self):  # {{{
             If a restart file is not available from which to read mesh
             information or if no history files are available from which to
             compute the climatology in the desired time range.
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -297,12 +290,10 @@ def setup_and_check(self):  # {{{
         with xarray.open_dataset(self.inputFiles[0]) as ds:
             self.allVariables = list(ds.data_vars.keys())
 
-        # }}}
-
-    def run_task(self):  # {{{
-        '''
+    def run_task(self):
+        """
         Compute the requested climatologies
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -315,10 +306,10 @@ def run_task(self):  # {{{
             # subtasks will take care of it, so nothing to do
             return
 
-        self.logger.info('\nComputing MPAS climatologies from files:\n'
-                         '    {} through\n    {}'.format(
-                             os.path.basename(self.inputFiles[0]),
-                             os.path.basename(self.inputFiles[-1])))
+        self.logger.info(
+            f'\nComputing MPAS climatologies from files:\n'
+            f'    {os.path.basename(self.inputFiles[0])} through\n'
+            f'    {os.path.basename(self.inputFiles[-1])}')
 
         seasonsToCheck = list(constants.abrevMonthNames)
 
@@ -353,9 +344,7 @@ def run_task(self):  # {{{
                 inDirectory=self.symlinkDirectory,
                 outDirectory=climatologyDirectory)
 
-        # }}}
-
-    def get_start_and_end(self):  # {{{
+    def get_start_and_end(self):
         """
         Get the start and end years and dates for the climatology.  This
         function is provided to allow a custom method for setting the start
@@ -377,9 +366,7 @@ def get_start_and_end(self):  # {{{
 
         return startYear, endYear
 
-        # }}}
-
-    def get_file_name(self, season):  # {{{
+    def get_file_name(self, season):
         """
 
         Returns the full path for MPAS climatology file produced by ncclimo.
@@ -402,9 +389,7 @@ def get_file_name(self, season):  # {{{
                                                        self.componentName,
                                                        self.op)
 
-        # }}}
-
-    def _create_symlinks(self):  # {{{
+    def _create_symlinks(self):
         """
         Create symlinks to monthly mean files so they have the expected file
         naming convention for ncclimo.
@@ -434,9 +419,9 @@ def _create_symlinks(self):  # {{{
         make_directories(symlinkDirectory)
 
         for inFileName, year, month in zip(fileNames, years, months):
-            outFileName = '{}/{}.hist.am.timeSeriesStatsMonthly.{:04d}-' \
-                '{:02d}-01.nc'.format(symlinkDirectory, self.ncclimoModel,
-                                      year, month)
+            outFileName = \
+                f'{symlinkDirectory}/{self.ncclimoModel}.hist.am.' \
+                f'timeSeriesStatsMonthly.{year:04d}-{month:02d}-01.nc'
 
             try:
                 os.symlink(inFileName, outFileName)
@@ -445,12 +430,10 @@ def _create_symlinks(self):  # {{{
 
         return symlinkDirectory
 
-        # }}}
-
     def _compute_climatologies_with_ncclimo(self, inDirectory, outDirectory,
                                             remapper=None,
-                                            remappedDirectory=None):  # {{{
-        '''
+                                            remappedDirectory=None):
+        """
         Uses ncclimo to compute monthly, seasonal and/or annual climatologies.
 
         Parameters
@@ -475,7 +458,7 @@ def _compute_climatologies_with_ncclimo(self, inDirectory, outDirectory,
         ------
         OSError
             If ``ncclimo`` is not in the system path.
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -554,12 +537,9 @@ def _compute_climatologies_with_ncclimo(self, inDirectory, outDirectory,
 
         os.chdir(workDir)
 
-        # }}}
-    # }}}
 
-
-class MpasClimatologySeasonSubtask(AnalysisTask):  # {{{
-    '''
+class MpasClimatologySeasonSubtask(AnalysisTask):
+    """
     An analysis subtasks for computing climatologies from output from the
     ``timeSeriesStatsMonthly`` analysis member for a single month or season.
 
@@ -571,13 +551,14 @@ class MpasClimatologySeasonSubtask(AnalysisTask):  # {{{
 
     parentTask : ``MpasClimatologyTask``
         The task that this subtask belongs to.
-    '''
+    """
+
     # Authors
     # -------
     # Xylar Asay-Davis
 
-    def __init__(self, parentTask, season, subtaskName=None):  # {{{
-        '''
+    def __init__(self, parentTask, season, subtaskName=None):
+        """
         Construct the analysis task and adds it as a subtask of the
         ``parentTask``.
 
@@ -592,7 +573,7 @@ def __init__(self, parentTask, season, subtaskName=None):  # {{{
         subtaskName : str, optional
             the name of the subtask, defaults to season
 
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -620,12 +601,10 @@ def __init__(self, parentTask, season, subtaskName=None):  # {{{
             multiprocessing.cpu_count(),
             self.config.getint('climatology', 'daskThreads'))
 
-        # }}}
-
-    def run_task(self):  # {{{
-        '''
+    def run_task(self):
+        """
         Compute the requested climatologies
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -642,10 +621,10 @@ def run_task(self):  # {{{
             # nothing to do
             return
 
-        self.logger.info('\nComputing MPAS climatology from files:\n'
-                         '    {} through\n    {}'.format(
-                             os.path.basename(parentTask.inputFiles[0]),
-                             os.path.basename(parentTask.inputFiles[-1])))
+        self.logger.info(
+            f'\nComputing MPAS climatologies from files:\n'
+            f'    {os.path.basename(parentTask.inputFiles[0])} through\n'
+            f'    {os.path.basename(parentTask.inputFiles[-1])}')
 
         climatologyFileName = parentTask.get_file_name(season)
         climatologyDirectory = get_unmasked_mpas_climatology_directory(
@@ -668,11 +647,9 @@ def run_task(self):  # {{{
                     inDirectory=parentTask.symlinkDirectory,
                     outDirectory=climatologyDirectory)
 
-        # }}}
-
     def _compute_climatologies_with_xarray(self, inDirectory, outDirectory):
-        # {{{
-        '''
+
+        """
         Uses xarray to compute seasonal and/or annual climatologies.
 
         Parameters
@@ -682,7 +659,8 @@ def _compute_climatologies_with_xarray(self, inDirectory, outDirectory):
 
         outDirectory : str
             The output directory where climatologies will be written
-        '''
+        """
+
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -704,7 +682,7 @@ def _preprocess(ds):
 
             fileNames = sorted(parentTask.inputFiles)
             years, months = get_files_year_month(
-                fileNames,  self.historyStreams,
+                fileNames, self.historyStreams,
                 parentTask.streamName)
 
             with xarray.open_mfdataset(parentTask.inputFiles,
@@ -732,9 +710,9 @@ def _preprocess(ds):
             fileNames = []
             weights = []
             for month in constants.monthDictionary[season]:
-                monthName = constants.abrevMonthNames[month-1]
+                monthName = constants.abrevMonthNames[month - 1]
                 fileNames.append(parentTask.get_file_name(season=monthName))
-                weights.append(constants.daysInMonth[month-1])
+                weights.append(constants.daysInMonth[month - 1])
 
             with xarray.open_mfdataset(fileNames, concat_dim='weight',
                                        combine='nested',
@@ -742,12 +720,7 @@ def _preprocess(ds):
                                        decode_cf=False, decode_times=False,
                                        preprocess=_preprocess) as ds:
                 ds.coords['weight'] = ('weight', weights)
-                ds = ((ds.weight*ds).sum(dim='weight') /
+                ds = ((ds.weight * ds).sum(dim='weight') /
                       ds.weight.sum(dim='weight'))
                 ds.compute(num_workers=self.subprocessCount)
                 write_netcdf(ds, outFileName)
-
-        # }}}
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/climatology/ref_year_mpas_climatology_task.py b/mpas_analysis/shared/climatology/ref_year_mpas_climatology_task.py
index 709bc96d5..db494b0e9 100644
--- a/mpas_analysis/shared/climatology/ref_year_mpas_climatology_task.py
+++ b/mpas_analysis/shared/climatology/ref_year_mpas_climatology_task.py
@@ -1,27 +1,24 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
+from io import StringIO
 
-from six import StringIO
-
-from mpas_analysis.configuration import MpasAnalysisConfigParser
+from mpas_tools.config import MpasConfigParser
 
 from mpas_analysis.shared.climatology import MpasClimatologyTask
 from mpas_analysis.shared.timekeeping.utility import get_simulation_start_time
 
 
-class RefYearMpasClimatologyTask(MpasClimatologyTask):  # {{{
-    '''
+class RefYearMpasClimatologyTask(MpasClimatologyTask):
+    """
     An analysis tasks for computing a reference-year climatology for computing
     climatology anomalies from the``timeSeriesStatsMonthly`` analysis member.
 
@@ -30,19 +27,19 @@ class RefYearMpasClimatologyTask(MpasClimatologyTask):  # {{{
 
     anomalyRefYear : int
         The reference year over which to compute the climatology
-    '''
+    """
     # Authors
     # -------
     # Xylar Asay-Davis
 
-    def __init__(self, config, componentName, taskName=None):  # {{{
-        '''
+    def __init__(self, config, componentName, taskName=None):
+        """
         Construct the analysis task and adds it as a subtask of the
         ``parentTask``.
 
         Parameters
         ----------
-        config : ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Contains configuration options
 
         componentName : {'ocean', 'seaIce'}
@@ -51,7 +48,7 @@ def __init__(self, config, componentName, taskName=None):  # {{{
 
         taskName : str, optional
             the name of the task, defaults to mpasClimatology<ComponentName>
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -63,12 +60,7 @@ def __init__(self, config, componentName, taskName=None):  # {{{
         # make a deep copy of the config so we can change the start and end
         # years and dates without causing trouble for other tasks
 
-        config_string = StringIO()
-        config.write(config_string)
-        # We must reset the buffer to make it ready for reading.
-        config_string.seek(0)
-        new_config = MpasAnalysisConfigParser()
-        new_config.read_file(config_string)
+        new_config = config.copy()
 
         # call the constructor from the base class (AnalysisTask)
         super(RefYearMpasClimatologyTask, self).__init__(
@@ -77,9 +69,8 @@ def __init__(self, config, componentName, taskName=None):  # {{{
             taskName=taskName)
 
         self.tags.append('anomaly')
-        # }}}
 
-    def get_start_and_end(self):  # {{{
+    def get_start_and_end(self):
         """
         Get the start and end years and dates for the climatology.  This
         function is provided to allow a custom method for setting the start
@@ -116,8 +107,4 @@ def get_start_and_end(self):  # {{{
 
         return startYear, endYear
 
-        # }}}
-    # }}}
-
 
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/climatology/remap_mpas_climatology_subtask.py b/mpas_analysis/shared/climatology/remap_mpas_climatology_subtask.py
index a793abdf2..46b9ae9a9 100644
--- a/mpas_analysis/shared/climatology/remap_mpas_climatology_subtask.py
+++ b/mpas_analysis/shared/climatology/remap_mpas_climatology_subtask.py
@@ -1,23 +1,19 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 import numpy
 import os
 from pyremap import MpasMeshDescriptor
 
-
 from mpas_analysis.shared.analysis_task import AnalysisTask
 
 from mpas_analysis.shared.constants import constants
@@ -34,8 +30,8 @@
     get_comparison_descriptor
 
 
-class RemapMpasClimatologySubtask(AnalysisTask):  # {{{
-    '''
+class RemapMpasClimatologySubtask(AnalysisTask):
+    """
     An analysis tasks for computing climatologies from output from the
     ``timeSeriesStatsMonthly`` analysis member.
 
@@ -76,7 +72,8 @@ class RemapMpasClimatologySubtask(AnalysisTask):  # {{{
     op : {'avg', 'min', 'max'}
          operator for monthly stats
 
-    '''
+    """
+
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -85,8 +82,8 @@ def __init__(self, mpasClimatologyTask, parentTask, climatologyName,
                  variableList, seasons, comparisonGridNames=None,
                  iselValues=None, subtaskName='remapMpasClimatology',
                  useNcremap=None):
-        # {{{
-        '''
+
+        """
         Construct the analysis task and adds it as a subtask of the
         ``parentTask``.
 
@@ -133,7 +130,7 @@ def __init__(self, mpasClimatologyTask, parentTask, climatologyName,
             if it is not explicitly given.  If a comparison grid other than
             ``latlon`` is given, ncremap is not supported so this flag is set
             to ``False``.
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -177,10 +174,8 @@ def __init__(self, mpasClimatologyTask, parentTask, climatologyName,
         else:
             self.useNcremap = useNcremap
 
-        # }}}
-
-    def setup_and_check(self):  # {{{
-        '''
+    def setup_and_check(self):
+        """
         Perform steps to set up the analysis and check for errors in the setup.
 
         Raises
@@ -189,7 +184,7 @@ def setup_and_check(self):  # {{{
             If a restart file is not available from which to read mesh
             information or if no history files are available from which to
             compute the climatology in the desired time range.
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -222,12 +217,10 @@ def setup_and_check(self):  # {{{
                                                      'mappingSubdirectory')
         make_directories(mappingSubdirectory)
 
-        # }}}
-
-    def run_task(self):  # {{{
-        '''
+    def run_task(self):
+        """
         Compute the requested climatologies
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -263,11 +256,10 @@ def run_task(self):  # {{{
                                 remapper=self.remappers[comparisonGridName],
                                 comparisonGridName=comparisonGridName,
                                 season=season)
-        # }}}
 
     def add_comparison_grid_descriptor(self, comparisonGridName,
-                                       comparisonDescriptor):  # {{{
-        '''
+                                       comparisonDescriptor):
+        """
         Add a custom grid descriptor (something other than 'latlon',
         'antarctic', 'arctic', 'north_atlantic', or 'north_pacific').
 
@@ -280,11 +272,11 @@ def add_comparison_grid_descriptor(self, comparisonGridName,
             A descriptor of the comparison grid to use for
             remapping
 
-        '''
+        """
         self.comparisonDescriptors[comparisonGridName] = \
-            comparisonDescriptor  # }}}
+            comparisonDescriptor
 
-    def get_masked_file_name(self, season):  # {{{
+    def get_masked_file_name(self, season):
         """
         Given config options, the name of a field and a string identifying the
         months in a seasonal climatology, returns the full path for MPAS
@@ -310,9 +302,9 @@ def get_masked_file_name(self, season):  # {{{
                                                          self.climatologyName,
                                                          self.op)
 
-        return fileName  # }}}
+        return fileName
 
-    def get_remapped_file_name(self, season, comparisonGridName):  # {{{
+    def get_remapped_file_name(self, season, comparisonGridName):
         """
         Given config options, the name of a field and a string identifying the
         months in a seasonal climatology, returns the full path for MPAS
@@ -339,9 +331,9 @@ def get_remapped_file_name(self, season, comparisonGridName):  # {{{
             self.config, season, self.componentName, self.climatologyName,
             comparisonGridName, self.op)
 
-        return fileName  # }}}
+        return fileName
 
-    def customize_masked_climatology(self, climatology, season):  # {{{
+    def customize_masked_climatology(self, climatology, season):
         """
         Override this function to customize the climatology during the masking
         phase (before remapping)
@@ -365,10 +357,10 @@ def customize_masked_climatology(self, climatology, season):  # {{{
         # -------
         # Xylar Asay-Davis
 
-        return climatology  # }}}
+        return climatology
 
     def customize_remapped_climatology(self, climatology, comparisonGridNames,
-                                       season):  # {{{
+                                       season):
         """
         Override this function to customize the climatology after remapping
 
@@ -393,9 +385,9 @@ def customize_remapped_climatology(self, climatology, comparisonGridNames,
         # -------
         # Xylar Asay-Davis
 
-        return climatology  # }}}
+        return climatology
 
-    def _setup_remappers(self):  # {{{
+    def _setup_remappers(self):
         """
         Set up the remappers for remapping from the MPAS to the comparison
         grids.
@@ -410,7 +402,6 @@ def _setup_remappers(self):  # {{{
         mappingFilePrefix = 'map'
         self.remappers = {}
         for comparisonGridName in self.comparisonDescriptors:
-
             comparisonDescriptor = \
                 self.comparisonDescriptors[comparisonGridName]
             self.comparisonGridName = comparisonDescriptor.meshName
@@ -426,9 +417,7 @@ def _setup_remappers(self):  # {{{
                 method=config.get('climatology', 'mpasInterpolationMethod'),
                 logger=self.logger)
 
-        # }}}
-
-    def _setup_file_names(self):  # {{{
+    def _setup_file_names(self):
         """
         Create a dictionary of file names and directories for this climatology
         """
@@ -497,10 +486,9 @@ def _setup_file_names(self):  # {{{
 
             self._outputDirs[key] = directory
             self._outputFiles[key] = fileName
-        # }}}
 
-    def _mask_climatologies(self, season, dsMask):  # {{{
-        '''
+    def _mask_climatologies(self, season, dsMask):
+        """
         For each season, creates a masked version of the climatology
 
         Parameters
@@ -515,7 +503,7 @@ def _mask_climatologies(self, season, dsMask):  # {{{
         Author
         ------
         Xylar Asay-Davis
-        '''
+        """
 
         climatologyFileName = self.mpasClimatologyTask.get_file_name(season)
 
@@ -550,10 +538,9 @@ def _mask_climatologies(self, season, dsMask):  # {{{
                                                             season)
 
             write_netcdf(climatology, maskedClimatologyFileName)
-        # }}}
 
     def _remap(self, inFileName, outFileName, remapper, comparisonGridName,
-               season):  # {{{
+               season):
         """
         Performs remapping either using ``ncremap`` or the native python code,
         depending on the requested setting and the comparison grid
@@ -615,9 +602,4 @@ def _remap(self, inFileName, outFileName, remapper, comparisonGridName,
         remappedClimatology = self.customize_remapped_climatology(
             remappedClimatology, comparisonGridName, season)
 
-        write_netcdf(remappedClimatology, outFileName)  # }}}
-
-    # }}}
-
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+        write_netcdf(remappedClimatology, outFileName)
diff --git a/mpas_analysis/shared/climatology/remap_observed_climatology_subtask.py b/mpas_analysis/shared/climatology/remap_observed_climatology_subtask.py
index abe28f820..4450d7afe 100644
--- a/mpas_analysis/shared/climatology/remap_observed_climatology_subtask.py
+++ b/mpas_analysis/shared/climatology/remap_observed_climatology_subtask.py
@@ -1,16 +1,13 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import os
 import os.path
 import xarray as xr
@@ -30,7 +27,7 @@
     get_comparison_descriptor
 
 
-class RemapObservedClimatologySubtask(AnalysisTask):  # {{{
+class RemapObservedClimatologySubtask(AnalysisTask):
     """
     An analysis task for comparison of 2D model fields against observations.
 
@@ -50,6 +47,7 @@ class RemapObservedClimatologySubtask(AnalysisTask):  # {{{
     comparisonGridNames : list of str
         The name(s) of the comparison grid to use for remapping.
     """
+
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -57,8 +55,8 @@ class RemapObservedClimatologySubtask(AnalysisTask):  # {{{
     def __init__(self, parentTask, seasons, fileName, outFilePrefix,
                  comparisonGridNames=['latlon'],
                  subtaskName='remapObservations'):
-        # {{{
-        '''
+
+        """
         Construct one analysis subtask for each plot (i.e. each season and
         comparison grid) and a subtask for computing climatologies.
 
@@ -84,7 +82,7 @@ def __init__(self, parentTask, seasons, fileName, outFilePrefix,
 
         subtaskName : str, optional
             The name of the subtask
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -103,9 +101,8 @@ def __init__(self, parentTask, seasons, fileName, outFilePrefix,
         super(RemapObservedClimatologySubtask, self).__init__(
             config=config, taskName=taskName, subtaskName=subtaskName,
             componentName=componentName, tags=tags)
-        # }}}
 
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
         """
@@ -131,9 +128,7 @@ def setup_and_check(self):  # {{{
             ds = self.build_observational_dataset(self.fileName)
             write_netcdf(ds, obsFileName)
 
-        # }}}
-
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Performs remapping of obsrevations to the comparsion grid
         """
@@ -191,10 +186,8 @@ def run_task(self):  # {{{
                             remappedFileName, remapper,
                             logger=self.logger)
 
-        # }}}
-
-    def get_observation_descriptor(self, fileName):  # {{{
-        '''
+    def get_observation_descriptor(self, fileName):
+        """
         get a MeshDescriptor for the observation grid.  A subclass derived from
         this class must override this method to create the appropriate
         descriptor
@@ -208,15 +201,15 @@ def get_observation_descriptor(self, fileName):  # {{{
         -------
         obsDescriptor : ``MeshDescriptor``
             The descriptor for the observation grid
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
 
-        return None  # }}}
+        return None
 
-    def build_observational_dataset(self, fileName):  # {{{
-        '''
+    def build_observational_dataset(self, fileName):
+        """
         read in the data sets for observations, and possibly rename some
         variables and dimensions.  A subclass derived from this class must
         override this method to create the appropriate data set
@@ -230,17 +223,15 @@ def build_observational_dataset(self, fileName):  # {{{
         -------
         dsObs : ``xarray.Dataset``
             The observational dataset
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
 
-        return None  # }}}
-
-    # }}}
+        return None
 
     def get_file_name(self, stage, season=None, comparisonGridName=None):
-        # {{{
+
         """
         Given config options, the name of a field and a string identifying the
         months in a seasonal climatology, returns the full path for MPAS
@@ -310,9 +301,9 @@ def get_file_name(self, stage, season=None, comparisonGridName=None):
         else:
             raise ValueError('Unknown stage {}'.format(stage))
 
-        return fileName  # }}}
+        return fileName
 
-    def _setup_remappers(self, fileName):  # {{{
+    def _setup_remappers(self, fileName):
         """
         Set up the remappers for remapping from observations to the comparison
         grids.
@@ -335,7 +326,6 @@ def _setup_remappers(self, fileName):  # {{{
         outFilePrefix = self.outFilePrefix
         self.remappers = {}
         for comparisonGridName in self.comparisonGridNames:
-
             comparisonDescriptor = get_comparison_descriptor(
                 config, comparison_grid_name=comparisonGridName)
 
@@ -347,7 +337,3 @@ def _setup_remappers(self, fileName):  # {{{
                 method=config.get(sectionName,
                                   'interpolationMethod'),
                 logger=self.logger)
-        # }}}
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/constants/constants.py b/mpas_analysis/shared/constants/constants.py
index ecbb5cabe..49dfed947 100644
--- a/mpas_analysis/shared/constants/constants.py
+++ b/mpas_analysis/shared/constants/constants.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -15,14 +15,9 @@
 # -------
 # Luke Van Roekel, Xylar Asay-Davis, Milena Veneziani
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import numpy as np
 
 # set parameters for default climatology comparison grid
-dLongitude = 0.5
-dLatitude = 0.5
 lonmin = -180.
 lonmax = 180.
 latmin = -90.
@@ -74,5 +69,3 @@
 
 # cm per m
 cm_per_m = 100.
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/containers.py b/mpas_analysis/shared/containers.py
index f7c7ea87d..519f0f0bb 100644
--- a/mpas_analysis/shared/containers.py
+++ b/mpas_analysis/shared/containers.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -16,13 +16,10 @@
     10/22/2016
 """
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 from collections.abc import Mapping
 
 
-class ReadOnlyDict(Mapping):  # {{{
+class ReadOnlyDict(Mapping):
     """ Read only-dictionary
     http://stackoverflow.com/questions/19022868/how-to-make-dictionary-read-only-in-python
     310/22/2016
@@ -41,5 +38,3 @@ def __len__(self):
     def __iter__(self):
         return iter(self._data)
 # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/generalized_reader/generalized_reader.py b/mpas_analysis/shared/generalized_reader/generalized_reader.py
index 71e8474b3..70b904d6a 100644
--- a/mpas_analysis/shared/generalized_reader/generalized_reader.py
+++ b/mpas_analysis/shared/generalized_reader/generalized_reader.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -22,10 +22,6 @@
 # -------
 # Xylar Asay-Davis
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
-import six
 import xarray
 from functools import partial
 import resource
@@ -41,7 +37,7 @@ def open_multifile_dataset(fileNames, calendar, config,
                            variableList=None, selValues=None,
                            iselValues=None, variableMap=None,
                            startDate=None, endDate=None,
-                           chunking=None):  # {{{
+                           chunking=None):
     """
     Opens and returns an xarray data set given file name(s) and the MPAS
     calendar name.
@@ -54,7 +50,7 @@ def open_multifile_dataset(fileNames, calendar, config,
     calendar : {``'gregorian'``, ``'gregorian_noleap'``}, optional
         The name of one of the calendars supported by MPAS cores
 
-    config :  instance of ``MpasAnalysisConfigParser``
+    config : mpas_tools.config.MpasConfigParser
         Contains configuration options
 
     simulationStartTime : string, optional
@@ -151,10 +147,10 @@ def open_multifile_dataset(fileNames, calendar, config,
     ds = mpas_xarray.remove_repeated_time_index(ds)
 
     if startDate is not None and endDate is not None:
-        if isinstance(startDate, six.string_types):
+        if isinstance(startDate, str):
             startDate = string_to_days_since_date(dateString=startDate,
                                                   calendar=calendar)
-        if isinstance(endDate, six.string_types):
+        if isinstance(endDate, str):
             endDate = string_to_days_since_date(dateString=endDate,
                                                 calendar=calendar)
 
@@ -173,12 +169,12 @@ def open_multifile_dataset(fileNames, calendar, config,
 
     ds = mpas_xarray.process_chunking(ds, chunking)
 
-    return ds  # }}}
+    return ds
 
 
 def _preprocess(ds, calendar, simulationStartTime, timeVariableName,
                 variableList, selValues, iselValues, variableMap,
-                startDate, endDate):  # {{{
+                startDate, endDate):
     """
     Performs variable remapping, then calls mpas_xarray.preprocess, to
     perform the remainder of preprocessing.
@@ -281,10 +277,10 @@ def _preprocess(ds, calendar, simulationStartTime, timeVariableName,
                                 selValues=selValues,
                                 iselValues=iselValues)
 
-    return ds  # }}}
+    return ds
 
 
-def _map_variable_name(variableName, ds, variableMap):  # {{{
+def _map_variable_name(variableName, ds, variableMap):
     """
     Given a `variableName` in a `variableMap` and an xarray `ds`,
     return the name of the the first variable in `variableMap[variableName]`
@@ -343,10 +339,9 @@ def _map_variable_name(variableName, ds, variableMap):  # {{{
                      'variables in {}.'.format(
                          variableName, possibleVariables,
                          ds.data_vars.keys()))
-    # }}}
 
 
-def _rename_variables(ds, variableMap):  # {{{
+def _rename_variables(ds, variableMap):
     """
     Given an `xarray.DataSet` object `ds` and a dictionary mapping
     variable names `variableMap`, returns a new data set in which variables
@@ -380,7 +375,7 @@ def _rename_variables(ds, variableMap):  # {{{
                 renameDict[datasetVariable] = mapVariable
                 break
 
-    return ds.rename(renameDict)  # }}}
+    return ds.rename(renameDict)
 
 
 # vim: ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/html/image_xml.py b/mpas_analysis/shared/html/image_xml.py
index 89acc81e4..4f820ff0c 100644
--- a/mpas_analysis/shared/html/image_xml.py
+++ b/mpas_analysis/shared/html/image_xml.py
@@ -1,17 +1,14 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import os
 import sys
 import socket
@@ -34,7 +31,7 @@ def write_image_xml(config, filePrefix, componentName, componentSubdirectory,
 
     Parameters
     ----------
-    config : ``MpasAnalysisConfigParser`` object
+    config : mpas_tools.config.MpasConfigParser
         contains config options
 
     filePrefix : str
@@ -151,7 +148,7 @@ def write_image_xml(config, filePrefix, componentName, componentSubdirectory,
     tree.write(xmlFileName, xml_declaration=True, pretty_print=True)
 
 
-def _provenance_command(root, history):  # {{{
+def _provenance_command(root, history):
     """
     Utility funciton for provenance of xml file associated with a plot.
     """
@@ -186,7 +183,7 @@ def _provenance_command(root, history):  # {{{
     except (IOError, OSError):
         githash = 'git hash unavailable'
 
-    etree.SubElement(root, 'githash').text = githash  # }}}
+    etree.SubElement(root, 'githash').text = githash
 
 
 def _generate_thumbnails(imageFileName, directory):
@@ -240,5 +237,3 @@ def _generate_thumbnails(imageFileName, directory):
 
     return imageSize, thumbnailSize, orientation
 
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/html/pages.py b/mpas_analysis/shared/html/pages.py
index caf46b641..3fdfb1284 100644
--- a/mpas_analysis/shared/html/pages.py
+++ b/mpas_analysis/shared/html/pages.py
@@ -1,17 +1,14 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import pkg_resources
 from os import makedirs
 from lxml import etree
@@ -25,13 +22,12 @@
 
 
 def generate_html(config, analyses, controlConfig, customConfigFiles):
-    # {{{
     """
     Generates webpages for diplaying the plots from each analysis task
 
     Parameters
     ----------
-    config : ``MpasAnalysisConfigParser``
+    config : mpas_tools.config.MpasConfigParser
         Config options
 
     analysis : ``OrderedDict`` of ``AnalysisTask`` objects
@@ -40,7 +36,7 @@ def generate_html(config, analyses, controlConfig, customConfigFiles):
         the list of files to include on the webpage for the associated
         component.
 
-    controlConfig : ``MpasAnalysisConfigParser``
+    controlConfig : mpas_tools.config.MpasConfigParser
         Config options for a control run
 
     customConfigFiles : list of str
@@ -99,8 +95,6 @@ def generate_html(config, analyses, controlConfig, customConfigFiles):
     if url is None:
         print("Done.")
 
-    # }}}
-
 
 class MainPage(object):
     """
@@ -108,10 +102,10 @@ class MainPage(object):
 
     Attributes
     ----------
-    config : ``MpasAnalysisConfigParser``
+    config : mpas_tools.config.MpasConfigParser
         Config options
 
-    controlConfig : ``MpasAnalysisConfigParser``
+    controlConfig : mpas_tools.config.MpasConfigParser
         Config options for a control run
 
     customConfigFiles : list of str
@@ -125,6 +119,7 @@ class MainPage(object):
         Each component has a name, subdirectory and image name used to find
         the appropriate thumbnail.
     """
+
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -135,10 +130,10 @@ def __init__(self, config, controlConfig, customConfigFiles):
 
         Parameters
         ----------
-        config : ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Config options
 
-        controlConfig : ``MpasAnalysisConfigParser``
+        controlConfig : mpas_tools.config.MpasConfigParser
             Config options for a control run
 
         customConfigFiles : list of str
@@ -230,7 +225,8 @@ def generate(self):
 
             # substitute entries in the template and add the component to
             # the text describing all components
-            componentsText = componentsText + \
+            componentsText = \
+                componentsText + \
                 _replace_tempate_text(self.componentTemplate, replacements)
 
         githash = _get_git_hash()
@@ -250,13 +246,15 @@ def generate(self):
             replacements = {'@configName': os.path.basename(configFileName),
                             '@configDesc': shortName}
 
-            configsText = configsText + \
+            configsText = \
+                configsText + \
                 _replace_tempate_text(self.configTemplate, replacements)
 
-        replacements = {'@configName': 'config.complete.{}'.format(runName),
+        replacements = {'@configName': 'complete.{}.cfg'.format(runName),
                         '@configDesc': 'Complete Configuration File'}
 
-        configsText = configsText + \
+        configsText = \
+            configsText + \
             _replace_tempate_text(self.configTemplate, replacements)
 
         replacements = {'@runName': runName,
@@ -318,10 +316,10 @@ class ComponentPage(object):
 
     Attributes
     ----------
-    config : ``MpasAnalysisConfigParser``
+    config : mpas_tools.config.MpasConfigParser
         Config options
 
-    controlConfig : ``MpasAnalysisConfigParser``
+    controlConfig : mpas_tools.config.MpasConfigParser
         Config options for a control run
 
     name : str
@@ -339,6 +337,7 @@ class ComponentPage(object):
         A tree of information describing the the gallery groups in the page,
         the galleries in each group and the images in each gallery.
     """
+
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -349,7 +348,7 @@ def __init__(self, config, name, subdirectory, controlConfig=None):
 
         Parameters
         ----------
-        config : ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Config options
 
         name : str
@@ -360,7 +359,7 @@ def __init__(self, config, name, subdirectory, controlConfig=None):
         subdirecory : str
             The subdirectory for the component's webpage
 
-        controlConfig : ``MpasAnalysisConfigParser``, optional
+        controlConfig : mpas_tools.config.MpasConfigParser, optional
             Config options for a control run
         """
         # Authors
@@ -380,7 +379,6 @@ def __init__(self, config, name, subdirectory, controlConfig=None):
 
         for templateName in ['page', 'quicklink', 'group', 'gallery', 'image',
                              'subtitle']:
-
             # get template text
             fileName = pkg_resources.resource_filename(
                 __name__,
@@ -404,7 +402,7 @@ def add_image(xmlFileName, config, components, controlConfig=None):
         xmlFileName : str
             The full path to the XML file describing the image to be added
 
-        config : ``MpasAnalysisConfigParser`` object
+        config : mpas_tools.config.MpasConfigParser
             contains config options
 
         components : OrederdDict of dict
@@ -413,7 +411,7 @@ def add_image(xmlFileName, config, components, controlConfig=None):
             be added. ``components`` should be viewed as an input and output
             parameter, since it is modified by this function.
 
-        controlConfig : ``MpasAnalysisConfigParser``, optional
+        controlConfig : mpas_tools.config.MpasConfigParser, optional
             Config options for a control run
         """
         # Authors
@@ -499,10 +497,12 @@ def generate(self):
         quickLinkText = ''
         galleriesText = ''
         for groupName, groupDict in self.groups.items():
-            quickLinkText = quickLinkText + \
+            quickLinkText = \
+                quickLinkText + \
                 self._generate_quick_link_text(groupName, groupDict)
 
-            galleriesText = galleriesText + \
+            galleriesText = \
+                galleriesText + \
                 self._generate_group_text(groupName, groupDict)
 
         replacements = {'@runName': runName,
@@ -566,7 +566,7 @@ def _generate_gallery_text(self, galleryName, images):
         imagesText = ''
         for imageFileName, imageDict in images.items():
             imagesText = imagesText + \
-                self._generate_image_text(imageFileName, imageDict)
+                         self._generate_image_text(imageFileName, imageDict)
 
         if galleryName == 'None':
             galleryTitle = ''
@@ -597,7 +597,8 @@ def _generate_group_text(self, groupName, groupDict):
         """
         galleriesText = ''
         for galleryName, galleryDict in groupDict['galleries'].items():
-            galleriesText = galleriesText + \
+            galleriesText = \
+                galleriesText + \
                 self._generate_gallery_text(galleryName, galleryDict['images'])
 
         replacements = {'@analysisGroupName': groupName,
diff --git a/mpas_analysis/shared/html/templates/style.css b/mpas_analysis/shared/html/templates/style.css
index 6abcbc375..84267d7d7 100644
--- a/mpas_analysis/shared/html/templates/style.css
+++ b/mpas_analysis/shared/html/templates/style.css
@@ -1,10 +1,10 @@
 /*
 / This software is open source software available under the BSD-3 license.
 /
-/ Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-/ Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+/ Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+/ Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 / reserved.
-/ Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+/ Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 /
 / Additional copyright and license information can be found in the LICENSE file
 / distributed with this code, or at
diff --git a/mpas_analysis/shared/interpolation/interp_1d.py b/mpas_analysis/shared/interpolation/interp_1d.py
index 7cbd8e370..8f4eabce1 100644
--- a/mpas_analysis/shared/interpolation/interp_1d.py
+++ b/mpas_analysis/shared/interpolation/interp_1d.py
@@ -1,22 +1,19 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import numpy
 import xarray
 
 
 def interp_1d(ds, inInterpDim, inInterpCoord, outInterpDim,
-              outInterpCoord):  # {{{
+              outInterpCoord):
     """
     Interpolate 1D or 2D fields in 1D
 
@@ -49,11 +46,11 @@ def interp_1d(ds, inInterpDim, inInterpCoord, outInterpDim,
     # conert back to coords
     ds = ds.set_coords(coords)
 
-    return ds  # }}}
+    return ds
 
 
 def _compute_weights_and_indices(ds, inInterpDim, inInterpCoord, outInterpDim,
-                                 outInterpCoord):  # {{{
+                                 outInterpCoord):
     """
     add interpolation weights and indices to the data set
     """
@@ -161,10 +158,10 @@ def _compute_weights_and_indices(ds, inInterpDim, inInterpCoord, outInterpDim,
         indices[dim] = xarray.DataArray(indices[dim], dims=allOutDims)
     weight0 = xarray.DataArray(weight0, dims=allOutDims)
 
-    return indices, weight0  # }}}
+    return indices, weight0
 
 
-def _interp_1d_array(da, indices, weight0, inInterpDim):  # {{{
+def _interp_1d_array(da, indices, weight0, inInterpDim):
     """
     iterpolate a data array in 1D with the given indices and weights
     """
@@ -184,6 +181,4 @@ def _interp_1d_array(da, indices, weight0, inInterpDim):  # {{{
     da0 = da.isel(**indices0)
     da1 = da.isel(**indices1)
     da = weight0 * da0 + (1. - weight0) * da1
-    return da  # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
+    return da
diff --git a/mpas_analysis/shared/interpolation/utility.py b/mpas_analysis/shared/interpolation/utility.py
index 315befa6a..876474902 100644
--- a/mpas_analysis/shared/interpolation/utility.py
+++ b/mpas_analysis/shared/interpolation/utility.py
@@ -1,26 +1,23 @@
 
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import numpy
 import xarray
 
 
 def add_periodic_lon(ds, lonDim, degrees=True):
-    '''
+    """
     Add a single grid point that is a periodic image to the end of the data set
     in the lon dimension
-    '''
+    """
 
     lonRange = ds.lon[-1].values - ds.lon[0].values
     if degrees:
diff --git a/mpas_analysis/shared/io/download.py b/mpas_analysis/shared/io/download.py
index 0da45a91d..24e6c712d 100644
--- a/mpas_analysis/shared/io/download.py
+++ b/mpas_analysis/shared/io/download.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -18,9 +18,6 @@
 # Milena Veneziani
 # Xylar Asay-Davis
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 
 import os
 import requests
@@ -29,9 +26,9 @@
 
 # From https://stackoverflow.com/a/1094933/7728169
 def sizeof_fmt(num, suffix='B'):
-    '''
+    """
     Covert a number of bytes to a human-readable file size
-    '''
+    """
     for unit in ['', 'Ki', 'Mi', 'Gi', 'Ti', 'Pi', 'Ei', 'Zi']:
         if abs(num) < 1024.0:
             return "%3.1f%s%s" % (num, unit, suffix)
@@ -40,9 +37,9 @@ def sizeof_fmt(num, suffix='B'):
 
 
 def download_files(fileList, urlBase, outDir, verify=True):
-    '''
+    """
     Download a list of files from a URL to a directory
-    '''
+    """
     # Authors
     # -------
     # Milena Veneziani
diff --git a/mpas_analysis/shared/io/mpas_reader.py b/mpas_analysis/shared/io/mpas_reader.py
index 89535f904..26057fe48 100644
--- a/mpas_analysis/shared/io/mpas_reader.py
+++ b/mpas_analysis/shared/io/mpas_reader.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -16,10 +16,6 @@
 # -------
 # Xylar Asay-Davis
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
-import six
 import xarray
 
 from mpas_analysis.shared.timekeeping.utility import \
@@ -29,7 +25,7 @@
 def open_mpas_dataset(fileName, calendar,
                       timeVariableNames=['xtime_startMonthly',
                                          'xtime_endMonthly'],
-                      variableList=None, startDate=None, endDate=None):  # {{{
+                      variableList=None, startDate=None, endDate=None):
     """
     Opens and returns an xarray data set given file name(s) and the MPAS
     calendar name.
@@ -78,10 +74,10 @@ def open_mpas_dataset(fileName, calendar,
         ds = _parse_dataset_time(ds, timeVariableNames, calendar)
 
     if startDate is not None and endDate is not None:
-        if isinstance(startDate, six.string_types):
+        if isinstance(startDate, str):
             startDate = string_to_days_since_date(dateString=startDate,
                                                   calendar=calendar)
-        if isinstance(endDate, six.string_types):
+        if isinstance(endDate, str):
             endDate = string_to_days_since_date(dateString=endDate,
                                                 calendar=calendar)
 
@@ -96,12 +92,12 @@ def open_mpas_dataset(fileName, calendar,
     if variableList is not None:
         ds = ds[variableList]
 
-    return ds  # }}}
+    return ds
 
 
 def _parse_dataset_time(ds, inTimeVariableName, calendar,
                         outTimeVariableName='Time',
-                        referenceDate='0001-01-01'):  # {{{
+                        referenceDate='0001-01-01'):
     """
     A helper function for computing a time coordinate from an MPAS time
     variable.  Given a data set and a time variable name (or list of 2
@@ -205,7 +201,7 @@ def _parse_dataset_time(ds, inTimeVariableName, calendar,
         dsOut = ds.copy()
         dsOut.coords[outTimeVariableName] = (outTimeVariableName, days)
 
-    return dsOut  # }}}
+    return dsOut
 
 
 # vim: ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/io/namelist_streams_interface.py b/mpas_analysis/shared/io/namelist_streams_interface.py
index ce16825f5..aaa646d94 100644
--- a/mpas_analysis/shared/io/namelist_streams_interface.py
+++ b/mpas_analysis/shared/io/namelist_streams_interface.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -17,13 +17,11 @@
 # -------
 # Phillip Wolfram, Xylar Asay-Davis
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
-import six
 from lxml import etree
 import re
 import os.path
+import f90nml
+import json
 
 from mpas_analysis.shared.containers import ReadOnlyDict
 from mpas_analysis.shared.io.utility import paths
@@ -41,21 +39,25 @@ def convert_namelist_to_dict(fname, readonly=True):
 
     readonly : bool, optional
         Should the resulting dictionary read-only?
+
+    Returns
+    -------
+    nml : dict
+        A dictionary where keys are namelist options and values are namelist
     """
-    # Authors
-    # -------
-    # Phillip J Wolfram
-
-    # form dictionary
-    nml = dict()
-
-    regex = re.compile(r"^\s*(.*?)\s*=\s*['\"]*(.*?)['\"]*\s*\n")
-    with open(fname) as f:
-        for line in f:
-            match = regex.findall(line)
-            if len(match) > 0:
-                # assumes that there is only one match per line
-                nml[match[0][0].lower()] = match[0][1]
+    nml = f90nml.read(fname).todict()
+
+    # convert ordered dict to dict (Python 3 dict is ordered)
+    # https://stackoverflow.com/a/27373027/7728169
+    nml = json.loads(json.dumps(nml))
+
+    # flatten the dict
+    flat = dict()
+    for section in nml:
+        for key in nml[section]:
+            flat[key.lower()] = nml[section][key]
+    nml = flat
+
     if readonly:
         nml = ReadOnlyDict(nml)
 
@@ -67,6 +69,7 @@ class NameList:
     Class for fortran manipulation of namelist files, provides
     read and write functionality
     """
+
     # Authors
     # -------
     # Phillip Wolfram, Xylar Asay-Davis
@@ -124,7 +127,7 @@ def __getattr__(self, key):
     # provide accessor for dictionary notation (returns string)
     def __getitem__(self, key):
         """
-        Accessor for bracket noation, e.g., nml['field']
+        Accessor for bracket notation, e.g., nml['field']
 
         Parameters
         ----------
@@ -133,7 +136,7 @@ def __getitem__(self, key):
 
         Returns
         -------
-        value : str
+        value : Any
             The value associated with ``key``
         """
         # Authors
@@ -155,7 +158,7 @@ def get(self, key):
 
         Returns
         -------
-        value : str
+        value : Any
             The value associated with ``key``
         """
         # Authors
@@ -222,10 +225,9 @@ def getbool(self, key):
         # -------
         # Phillip Wolfram, Xylar Asay-Davis
 
-        if 'True' in self.nml[key.lower()] or 'true' in self.nml[key.lower()]:
-            return True
-        else:
-            return False
+        value = self.nml[key.lower()]
+        assert type(value) is bool
+        return value
 
     def find_option(self, possibleOptions):
         """
@@ -259,14 +261,13 @@ def find_option(self, possibleOptions):
         raise ValueError('None of the possible options {} found in namelist '
                          'file {}.'.format(possibleOptions, self.fname))
 
-    # }}}
-
 
 class StreamsFile:
     """
     Class to read in streams configuration file, provdies
     read and write functionality
     """
+
     # Authors
     # -------
     # Phillip Wolfram, Xylar Asay-Davis
@@ -440,12 +441,12 @@ def readpath(self, streamName, startDate=None, endDate=None,
 
         if startDate is not None:
             # read one extra file before the start date to be on the safe side
-            if isinstance(startDate, six.string_types):
+            if isinstance(startDate, str):
                 startDate = string_to_datetime(startDate)
 
         if endDate is not None:
             # read one extra file after the end date to be on the safe side
-            if isinstance(endDate, six.string_types):
+            if isinstance(endDate, str):
                 endDate = string_to_datetime(endDate)
 
         # remove any path that's part of the template
@@ -533,5 +534,3 @@ def find_stream(self, possibleStreams):
 
         raise ValueError('None of the possible streams {} found in streams '
                          'file {}.'.format(possibleStreams, self.fname))
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/io/utility.py b/mpas_analysis/shared/io/utility.py
index 050a5823e..15a49dd81 100644
--- a/mpas_analysis/shared/io/utility.py
+++ b/mpas_analysis/shared/io/utility.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -14,9 +14,6 @@
 Phillip J. Wolfram, Xylar Asay-Davis
 """
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import glob
 import os
 import random
@@ -27,7 +24,7 @@
 import warnings
 
 
-def paths(*args):  # {{{
+def paths(*args):
     """
     Returns glob'd paths in list for arbitrary number of function arguments.
     Note, each expanded set of paths is sorted.
@@ -49,11 +46,11 @@ def paths(*args):  # {{{
     paths = []
     for aargs in args:
         paths += sorted(glob.glob(aargs))
-    return paths  # }}}
+    return paths
 
 
 def fingerprint_generator(size=12,
-                          chars=string.ascii_uppercase + string.digits):  # {{{
+                          chars=string.ascii_uppercase + string.digits):
     """
     Returns a random string that can be used as a unique fingerprint
 
@@ -78,10 +75,10 @@ def fingerprint_generator(size=12,
     # -------
     # Phillip J. Wolfram
 
-    return ''.join(random.choice(chars) for _ in range(size))  # }}}
+    return ''.join(random.choice(chars) for _ in range(size))
 
 
-def make_directories(path):  # {{{
+def make_directories(path):
     """
     Make the given path if it does not already exist.
 
@@ -103,19 +100,19 @@ def make_directories(path):  # {{{
         os.makedirs(path)
     except OSError:
         pass
-    return path  # }}}
+    return path
 
 
 def build_config_full_path(config, section, relativePathOption,
                            relativePathSection=None,
                            defaultPath=None,
-                           baseDirectoryOption='baseDirectory'):  # {{{
+                           baseDirectoryOption='baseDirectory'):
     """
     Get a full path from a base directory and a relative path
 
     Parameters
     ----------
-    config : MpasAnalysisConfigParser object
+    config : mpas_tools.config.MpasConfigParser
         configuration from which to read the path
 
     section : str
@@ -157,16 +154,16 @@ def build_config_full_path(config, section, relativePathOption,
 
     if defaultPath is not None and not os.path.exists(fullPath):
         fullPath = defaultPath
-    return fullPath  # }}}
+    return fullPath
 
 
-def get_region_mask(config, regionMaskFile):  # {{{
+def get_region_mask(config, regionMaskFile):
     """
     Get the full path for a region mask with a given file name
 
     Parameters
     ----------
-    config : MpasAnalysisConfigParser object
+    config : mpas_tools.config.MpasConfigParser
         configuration from which to read the path
 
     regionMaskFile : str
@@ -217,16 +214,16 @@ def get_region_mask(config, regionMaskFile):  # {{{
             fullFileName = '{}/{}'.format(maskSubdirectory,
                                           regionMaskFile)
 
-    return fullFileName  # }}}
+    return fullFileName
 
 
 def build_obs_path(config, component, relativePathOption=None,
-                   relativePathSection=None, relativePath=None):  # {{{
+                   relativePathSection=None, relativePath=None):
     """
 
     Parameters
     ----------
-    config : MpasAnalysisConfigParser object
+    config : mpas_tools.config.MpasConfigParser
         configuration from which to read the path
 
     component : {'ocean', 'seaIce', 'iceberg'}
@@ -277,10 +274,10 @@ def build_obs_path(config, component, relativePathOption=None,
                 fullPath = '{}/{}/{}'.format(basePath, obsSubdirectory,
                                              relativePath)
 
-    return fullPath  # }}}
+    return fullPath
 
 
-def check_path_exists(path):  # {{{
+def check_path_exists(path):
     """
     Raise an exception if the given path does not exist.
 
@@ -299,10 +296,10 @@ def check_path_exists(path):  # {{{
     # Xylar Asay-Davis
 
     if not (os.path.isdir(path) or os.path.isfile(path)):
-        raise OSError('Path {} not found'.format(path))  # }}}
+        raise OSError('Path {} not found'.format(path))
 
 
-def get_files_year_month(fileNames, streamsFile, streamName):  # {{{
+def get_files_year_month(fileNames, streamsFile, streamName):
     """
     Extract the year and month from file names associated with a stream
 
@@ -334,7 +331,7 @@ def get_files_year_month(fileNames, streamsFile, streamName):  # {{{
     years = [dt.year for dt in dts]
     months = [dt.month for dt in dts]
 
-    return years, months  # }}}
+    return years, months
 
 
 def decode_strings(da):
@@ -374,5 +371,3 @@ def copyfile(src, dst):
         warnings.warn('Making a slow copy from {} to {}'.format(src, dst))
         with open(src, 'rb') as fsrc, open(dst, 'wb') as fdst:
             shutil.copyfileobj(fsrc, fdst)
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/io/write_netcdf.py b/mpas_analysis/shared/io/write_netcdf.py
index 3fed4b832..a5646711a 100644
--- a/mpas_analysis/shared/io/write_netcdf.py
+++ b/mpas_analysis/shared/io/write_netcdf.py
@@ -1,24 +1,19 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import netCDF4
 import numpy
 
-import six
-
 
-def write_netcdf(ds, fileName, fillValues=netCDF4.default_fillvals):  # {{{
-    '''
+def write_netcdf(ds, fileName, fillValues=netCDF4.default_fillvals):
+    """
     Write an xarray data set to a NetCDF file using finite fill values and
     unicode strings
 
@@ -34,7 +29,7 @@ def write_netcdf(ds, fileName, fillValues=netCDF4.default_fillvals):  # {{{
         A dictionary of fill values for each supported data type.  By default,
         this is the dictionary used by the netCDF4 package.  Key entries should
         be of the form 'f8' (for float64), 'i4' (for int32), etc.
-    '''
+    """
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -53,10 +48,9 @@ def write_netcdf(ds, fileName, fillValues=netCDF4.default_fillvals):  # {{{
 
         # make strings write as unicode instead
         if dtype.type is numpy.string_:
-            encodingDict[variableName] = {'dtype': six.text_type}
+            encodingDict[variableName] = {'dtype': str}
 
     ds.to_netcdf(fileName, encoding=encodingDict)
 
-    # }}}
 
 # vim: ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/mpas_xarray/mpas_xarray.py b/mpas_analysis/shared/mpas_xarray/mpas_xarray.py
index a8a0c622d..2990fd543 100644
--- a/mpas_analysis/shared/mpas_xarray/mpas_xarray.py
+++ b/mpas_analysis/shared/mpas_xarray/mpas_xarray.py
@@ -1,19 +1,15 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import numpy as np
-import six
 import xarray
 from functools import partial
 
@@ -38,7 +34,7 @@ def open_multifile_dataset(fileNames, calendar,
                            simulationStartTime=None,
                            timeVariableName='xtime',
                            variableList=None, selValues=None,
-                           iselValues=None):  # {{{
+                           iselValues=None):
     """
     Opens and returns an xarray data set given file name(s) and the MPAS
     calendar name.
@@ -121,10 +117,10 @@ def open_multifile_dataset(fileNames, calendar,
 
     ds = remove_repeated_time_index(ds)
 
-    return ds  # }}}
+    return ds
 
 
-def subset_variables(ds, variableList):  # {{{
+def subset_variables(ds, variableList):
     """
     Given a data set and a list of variable names, returns a new data set that
     contains only variables with those names.
@@ -167,11 +163,11 @@ def subset_variables(ds, variableList):  # {{{
             'are not found within the dataset '
             'variables: {}.'.format(variableList, allvars))
 
-    return ds  # }}}
+    return ds
 
 
 def preprocess(ds, calendar, simulationStartTime, timeVariableName,
-               variableList, selValues, iselValues):  # {{{
+               variableList, selValues, iselValues):
     """
     Builds correct time specification for MPAS, allowing a date offset
     because the time must be between 1678 and 2262 based on the xarray
@@ -261,10 +257,10 @@ def preprocess(ds, calendar, simulationStartTime, timeVariableName,
     if iselValues is not None:
         ds = ds.isel(**iselValues)
 
-    return ds  # }}}
+    return ds
 
 
-def remove_repeated_time_index(ds):  # {{{
+def remove_repeated_time_index(ds):
     """
     Remove repeated times from xarray dataset.
 
@@ -301,10 +297,10 @@ def remove_repeated_time_index(ds):  # {{{
     # remove repeated indices
     ds = ds.isel(Time=indices)
 
-    return ds  # }}}
+    return ds
 
 
-def _assert_valid_selections(ds, selvals, iselvals):  # {{{
+def _assert_valid_selections(ds, selvals, iselvals):
     """
     Ensure that dataset selections are compatable.
 
@@ -336,10 +332,10 @@ def test_vals_in_ds(vals, dims):
     test_vals_in_ds(selvals, ds.dims)
     test_vals_in_ds(iselvals, ds.dims)
 
-    return  # }}}
+    return
 
 
-def _ensure_list(alist):  # {{{
+def _ensure_list(alist):
     """
     Ensure that variables used as a list are actually lists.
     """
@@ -347,16 +343,16 @@ def _ensure_list(alist):  # {{{
     # -------
     # Phillip J. Wolfram, Xylar Asay-Davis
 
-    if isinstance(alist, six.string_types):
+    if isinstance(alist, str):
         # print 'Warning, converting %s to a list'%(alist)
         alist = [alist]
 
-    return alist  # }}}
+    return alist
 
 
 def _parse_dataset_time(ds, inTimeVariableName, calendar,
                         simulationStartTime, outTimeVariableName,
-                        referenceDate):  # {{{
+                        referenceDate):
     """
     A helper function for computing a time coordinate from an MPAS time
     variable.  Given a data set and a time variable name (or tuple of 2
@@ -512,10 +508,10 @@ def _parse_dataset_time(ds, inTimeVariableName, calendar,
         dsOut = ds.copy()
         dsOut.coords[outTimeVariableName] = (outTimeVariableName, days)
 
-    return dsOut  # }}}
+    return dsOut
 
 
-def process_chunking(ds, chunking):  # {{{
+def process_chunking(ds, chunking):
     """
     Computes chunking for a dataset.
 
@@ -563,6 +559,6 @@ def process_chunking(ds, chunking):  # {{{
             'Chunking parameter choice is not understood '
             'for {} of type {}\n'.format(chunking, type(chunking)))
 
-    return ds  # }}}
+    return ds
 
 # vim: ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/plot/climatology_map.py b/mpas_analysis/shared/plot/climatology_map.py
index 287b99001..f64077f35 100644
--- a/mpas_analysis/shared/plot/climatology_map.py
+++ b/mpas_analysis/shared/plot/climatology_map.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -16,9 +16,6 @@
 # -------
 # Xylar Asay-Davis, Milena Veneziani, Luke Van Roekel, Greg Streletz
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import matplotlib
 import matplotlib.pyplot as plt
 import matplotlib.colors as cols
@@ -63,7 +60,7 @@ def plot_polar_comparison(
 
     Parameters
     ----------
-    config : mpas_analysis.configuration.MpasAnalysisConfigParser
+    config : mpas_tools.config.MpasConfigParser
         the configuration, containing a [plot] section with options that
         control plotting
 
@@ -274,7 +271,7 @@ def plot_global_comparison(
 
     Parameters
     ----------
-    config : mpas_analysis.configuration.MpasAnalysisConfigParser
+    config : mpas_tools.config.MpasConfigParser
         the configuration, containing a [plot] section with options that
         control plotting
 
@@ -460,7 +457,7 @@ def plot_projection_comparison(
 
     Parameters
     ----------
-    config : mpas_analysis.configuration.MpasAnalysisConfigParser
+    config : mpas_tools.config.MpasConfigParser
         the configuration, containing a [plot] section with options that
         control plotting
 
@@ -592,17 +589,17 @@ def plot_panel(ax, title, array, colormap, norm, levels, ticks, contours,
     useCartopyCoastline = config.getboolean(section, 'useCartopyCoastline')
 
     if refArray is None:
-        figsize = config.getExpression(section, 'onePanelFigSize')
+        figsize = config.getexpression(section, 'onePanelFigSize')
         subplots = [111]
     elif vertical:
-        figsize = config.getExpression(section, 'threePanelVertFigSize')
+        figsize = config.getexpression(section, 'threePanelVertFigSize')
         subplots = [311, 312, 313]
     else:
-        figsize = config.getExpression(section, 'threePanelHorizFigSize')
+        figsize = config.getexpression(section, 'threePanelHorizFigSize')
         subplots = [131, 132, 133]
 
-    latLines = config.getExpression(section, 'latLines', usenumpyfunc=True)
-    lonLines = config.getExpression(section, 'lonLines', usenumpyfunc=True)
+    latLines = config.getexpression(section, 'latLines', use_numpyfunc=True)
+    lonLines = config.getexpression(section, 'lonLines', use_numpyfunc=True)
 
     # put latitude labels on the left unless we're in a polar projection
     left_labels = projectionName not in ['arctic', 'antarctic']
@@ -734,5 +731,3 @@ def _add_land_lakes_coastline(ax, ice_shelves=True):
                 facecolor='lightgray', linewidth=0.5)
         ax.add_feature(ice_50m, zorder=3)
     ax.add_feature(lakes_50m, zorder=4)
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/plot/colormap.py b/mpas_analysis/shared/plot/colormap.py
index 4780ff798..c2c4d8acd 100644
--- a/mpas_analysis/shared/plot/colormap.py
+++ b/mpas_analysis/shared/plot/colormap.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -15,22 +15,18 @@
 # -------
 # Xylar Asay-Davis, Milena Veneziani, Luke Van Roekel, Greg Streletz
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import matplotlib.pyplot as plt
 import matplotlib.colors as cols
 import numpy as np
 from matplotlib.colors import LinearSegmentedColormap
 import xml.etree.ElementTree as ET
-from six.moves import configparser
+import configparser
 import cmocean
 import pkg_resources
-from six import string_types
 
 
 def setup_colormap(config, configSectionName, suffix=''):
-    '''
+    """
     Set up a colormap from the registry
 
     Parameters
@@ -65,33 +61,38 @@ def setup_colormap(config, configSectionName, suffix=''):
         'lineWidth' is the width of contour lines or ``None`` if not specified
 
         'lineColor' is the color of contour lines or ``None`` if not specified
-    '''
+    """
     # Authors
     # -------
     # Xylar Asay-Davis, Milena Veneziani, Greg Streletz
 
     register_custom_colormaps()
 
-    colormapType = config.get(configSectionName,
-                              'colormapType{}'.format(suffix))
-    if colormapType == 'indexed':
-        (colormap, norm, levels, ticks) = _setup_indexed_colormap(
-            config, configSectionName, suffix=suffix)
-    elif colormapType == 'continuous':
-        (colormap, norm, ticks) = _setup_colormap_and_norm(
-            config, configSectionName, suffix=suffix)
-        levels = None
+    option = 'colormapType{}'.format(suffix)
+    if config.has_option(configSectionName, option):
+        colormapType = config.get(configSectionName, option)
+        if colormapType == 'indexed':
+            (colormap, norm, levels, ticks) = _setup_indexed_colormap(
+                config, configSectionName, suffix=suffix)
+        elif colormapType == 'continuous':
+            (colormap, norm, ticks) = _setup_colormap_and_norm(
+                config, configSectionName, suffix=suffix)
+            levels = None
+        else:
+            raise ValueError(f'config section {configSectionName} option '
+                             f'{option} is not "indexed" or "continuous"')
     else:
-        raise ValueError('config section {} option colormapType{} is not '
-                         '"indexed" or "continuous"'.format(
-                             configSectionName, suffix))
+        colormap = None
+        norm = None
+        levels = None
+        ticks = None
 
     option = 'contourLevels{}'.format(suffix)
     if config.has_option(configSectionName, option):
-        contours = config.getExpression(configSectionName,
+        contours = config.getexpression(configSectionName,
                                         option,
-                                        usenumpyfunc=True)
-        if isinstance(contours, string_types) and contours == 'none':
+                                        use_numpyfunc=True)
+        if isinstance(contours, str) and contours == 'none':
             contours = None
     else:
         contours = None
@@ -307,7 +308,7 @@ def register_custom_colormaps():
 
 
 def _setup_colormap_and_norm(config, configSectionName, suffix=''):
-    '''
+    """
     Set up a colormap from the registry
 
     Parameters
@@ -332,7 +333,7 @@ def _setup_colormap_and_norm(config, configSectionName, suffix=''):
 
     ticks : array of float
         the tick marks on the colormap
-    '''
+    """
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -344,7 +345,7 @@ def _setup_colormap_and_norm(config, configSectionName, suffix=''):
 
     normType = config.get(configSectionName, 'normType{}'.format(suffix))
 
-    kwargs = config.getExpression(configSectionName,
+    kwargs = config.getexpression(configSectionName,
                                   'normArgs{}'.format(suffix))
 
     if normType == 'symLog':
@@ -358,9 +359,9 @@ def _setup_colormap_and_norm(config, configSectionName, suffix=''):
             normType, configSectionName))
 
     try:
-        ticks = config.getExpression(
+        ticks = config.getexpression(
             configSectionName, 'colorbarTicks{}'.format(suffix),
-            usenumpyfunc=True)
+            use_numpyfunc=True)
     except(configparser.NoOptionError):
         ticks = None
 
@@ -368,7 +369,7 @@ def _setup_colormap_and_norm(config, configSectionName, suffix=''):
 
 
 def _setup_indexed_colormap(config, configSectionName, suffix=''):
-    '''
+    """
     Set up a colormap from the registry
 
     Parameters
@@ -395,7 +396,7 @@ def _setup_indexed_colormap(config, configSectionName, suffix=''):
 
     ticks : array of float
         the tick marks on the colormap
-    '''
+    """
     # Authors
     # -------
     # Xylar Asay-Davis, Milena Veneziani, Greg Streletz
@@ -403,14 +404,14 @@ def _setup_indexed_colormap(config, configSectionName, suffix=''):
     colormap = plt.get_cmap(config.get(configSectionName,
                                        'colormapName{}'.format(suffix)))
 
-    indices = config.getExpression(configSectionName,
+    indices = config.getexpression(configSectionName,
                                    'colormapIndices{}'.format(suffix),
-                                   usenumpyfunc=True)
+                                   use_numpyfunc=True)
 
     try:
-        levels = config.getExpression(
+        levels = config.getexpression(
             configSectionName, 'colorbarLevels{}'.format(suffix),
-            usenumpyfunc=True)
+            use_numpyfunc=True)
     except(configparser.NoOptionError):
         levels = None
 
@@ -435,9 +436,9 @@ def _setup_indexed_colormap(config, configSectionName, suffix=''):
     norm = cols.BoundaryNorm(levels, colormap.N)
 
     try:
-        ticks = config.getExpression(
+        ticks = config.getexpression(
             configSectionName, 'colorbarTicks{}'.format(suffix),
-            usenumpyfunc=True)
+            use_numpyfunc=True)
     except(configparser.NoOptionError):
         ticks = levels
 
@@ -445,7 +446,7 @@ def _setup_indexed_colormap(config, configSectionName, suffix=''):
 
 
 def _read_xml_colormap(xmlFile, map_name):
-    '''Read in an XML colormap'''
+    """Read in an XML colormap"""
 
     xml = ET.parse(xmlFile)
 
@@ -473,7 +474,7 @@ def _register_colormap_and_reverse(map_name, cmap):
 
 
 def _plot_color_gradients():
-    '''from https://matplotlib.org/tutorials/colors/colormaps.html'''
+    """from https://matplotlib.org/tutorials/colors/colormaps.html"""
 
     cmap_list = [m for m in plt.colormaps() if not m.endswith("_r")]
 
@@ -497,5 +498,3 @@ def _plot_color_gradients():
         ax.set_axis_off()
 
     plt.savefig('colormaps.png', dpi=100)
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/plot/inset.py b/mpas_analysis/shared/plot/inset.py
index aed9cef60..c2874ed1e 100644
--- a/mpas_analysis/shared/plot/inset.py
+++ b/mpas_analysis/shared/plot/inset.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -15,9 +15,6 @@
 # -------
 # Xylar Asay-Davis
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import matplotlib.path
 import matplotlib.ticker as mticker
 import cartopy
diff --git a/mpas_analysis/shared/plot/oned.py b/mpas_analysis/shared/plot/oned.py
index 6c9e21462..cb69999af 100644
--- a/mpas_analysis/shared/plot/oned.py
+++ b/mpas_analysis/shared/plot/oned.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -19,9 +19,6 @@
 # -------
 # Xylar Asay-Davis, Milena Veneziani, Luke Van Roekel, Greg Streletz
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import matplotlib
 import matplotlib.pyplot as plt
 
@@ -40,7 +37,7 @@ def plot_1D(config, xArrays, fieldArrays, errArrays,
             maxTitleLength=80,
             titleFontSize=None,
             axisFontSize=None,
-            defaultFontSize=None):  # {{{
+            defaultFontSize=None):
     """
     Plots a 1D line plot with error bars if available.
 
@@ -188,7 +185,5 @@ def plot_1D(config, xArrays, fieldArrays, errArrays,
     if fileout is not None:
         savefig(fileout, config)
 
-    plt.close()  # }}}
-
+    plt.close()
 
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/plot/save.py b/mpas_analysis/shared/plot/save.py
index 413ab10c3..d91523c38 100644
--- a/mpas_analysis/shared/plot/save.py
+++ b/mpas_analysis/shared/plot/save.py
@@ -1,17 +1,14 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import os
 
 import matplotlib.pyplot as plt
@@ -26,7 +23,7 @@ def savefig(filename, config, tight=True, pad_inches=0.1):
     filename : str
         the file name to be written
 
-    config :  mpas_analysis.configuration.MpasAnalysisConfigParser
+    config : mpas_tools.config.MpasConfigParser
         Configuration options
 
     tight : bool, optional
@@ -56,5 +53,3 @@ def savefig(filename, config, tight=True, pad_inches=0.1):
 
     plt.close()
 
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/plot/ticks.py b/mpas_analysis/shared/plot/ticks.py
index 1c86e4de5..e62c05373 100644
--- a/mpas_analysis/shared/plot/ticks.py
+++ b/mpas_analysis/shared/plot/ticks.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -12,9 +12,6 @@
 # -------
 # Xylar Asay-Davis, Milena Veneziani, Luke Van Roekel, Greg Streletz
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import matplotlib.pyplot as plt
 from matplotlib.ticker import FuncFormatter, FixedLocator
 import numpy as np
@@ -25,7 +22,7 @@
 
 
 def plot_xtick_format(calendar, minDays, maxDays, maxXTicks, yearStride=None):
-    '''
+    """
     Formats tick labels and positions along the x-axis for time series
     / index plots
 
@@ -46,7 +43,7 @@ def plot_xtick_format(calendar, minDays, maxDays, maxXTicks, yearStride=None):
 
     yearStride : int, optional
         the number of years to skip over between ticks
-    '''
+    """
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -91,5 +88,3 @@ def _date_tick(days, pos, calendar='gregorian', includeMonth=True):
     else:
         return '{:04d}'.format(date.year)
 
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/plot/time_series.py b/mpas_analysis/shared/plot/time_series.py
index ef36ff1b3..a38606889 100644
--- a/mpas_analysis/shared/plot/time_series.py
+++ b/mpas_analysis/shared/plot/time_series.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -15,9 +15,6 @@
 # -------
 # Xylar Asay-Davis, Milena Veneziani, Luke Van Roekel, Greg Streletz
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import matplotlib
 import matplotlib.pyplot as plt
 import xarray as xr
@@ -398,5 +395,3 @@ def timeseries_analysis_plot_polar(config, dsvalues, title,
         plt.title(title, **title_font)
 
     return fig
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/plot/vertical_section.py b/mpas_analysis/shared/plot/vertical_section.py
index 6597c420b..a86afa87b 100644
--- a/mpas_analysis/shared/plot/vertical_section.py
+++ b/mpas_analysis/shared/plot/vertical_section.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -16,12 +16,10 @@
 # -------
 # Xylar Asay-Davis, Milena Veneziani, Luke Van Roekel, Greg Streletz
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import matplotlib
 import matplotlib.pyplot as plt
 from matplotlib.tri import Triangulation
+from mpl_toolkits.axes_grid1 import make_axes_locatable
 import xarray as xr
 import numpy as np
 
@@ -63,6 +61,7 @@ def plot_vertical_section_comparison(
         lineWidth=2,
         lineStyle='solid',
         lineColor='black',
+        contourColormap=None,
         backgroundColor='grey',
         invalidColor='white',
         outlineValid=True,
@@ -78,6 +77,7 @@ def plot_vertical_section_comparison(
         maxXTicks=20,
         calendar='gregorian',
         compareAsContours=False,
+        comparisonContourLineWidth=None,
         comparisonContourLineStyle=None,
         comparisonContourLineColor=None,
         labelContours=False,
@@ -189,7 +189,7 @@ def plot_vertical_section_comparison(
         the number of dots per inch of the figure, taken from section ``plot``
         option ``dpi`` in the config file by default
 
-    lineWidth : int, optional
+    lineWidth : float, optional
         the line width of contour lines (if specified)
 
     lineStyle : str, optional
@@ -273,6 +273,10 @@ def plot_vertical_section_comparison(
        refArray is None, in which case only the contours of modelArray will be
        plotted on the single panel plot).
 
+    comparisonContourLineWidth : float, optional
+        the line width of contour lines of the comparisonFieldName field on
+        a contour comparison plot
+
     comparisonContourLineStyle : str, optional
         the line style of contour lines of the reference field on a contour
         comparison plot
@@ -336,13 +340,16 @@ def plot_vertical_section_comparison(
         # set the defaults, depending on if we have 1 or 3 panels, and
         # depending on how many x axes are to be displayed on the plots
         if singlePanel:
-            if compareAsContours and refArray is not None:
+            if compareAsContours and refArray is not None and \
+                    contourColormap is None:
+                # no color bar but there is a legend at the bottom
                 if len(xCoords) == 3:
                     figsize = (8, 8)
                 else:
                     figsize = (8, 7)
             else:
-                figsize = (8, 5)
+                # color bar and legend
+                figsize = (8, 7)
         elif len(xCoords) == 3:
             figsize = (8, 17)
         else:
@@ -417,6 +424,7 @@ def plot_vertical_section_comparison(
         lineWidth=lineWidth,
         lineStyle=lineStyle,
         lineColor=lineColor,
+        contourColormap=contourColormap,
         numUpperTicks=numUpperTicks,
         upperXAxisTickLabelPrecision=upperXAxisTickLabelPrecision,
         invertYAxis=invertYAxis,
@@ -432,6 +440,7 @@ def plot_vertical_section_comparison(
         contourComparisonField=contourComparisonField,
         comparisonFieldName=comparisonFieldName,
         originalFieldName=originalFieldName,
+        comparisonContourLineWidth=comparisonContourLineWidth,
         comparisonContourLineStyle=comparisonContourLineStyle,
         comparisonContourLineColor=comparisonContourLineColor,
         labelContours=labelContours,
@@ -563,6 +572,7 @@ def plot_vertical_section(
         lineWidth=2,
         lineStyle='solid',
         lineColor='black',
+        contourColormap=None,
         backgroundColor='grey',
         invalidColor='white',
         outlineValid=True,
@@ -579,11 +589,12 @@ def plot_vertical_section(
         contourComparisonField=None,
         comparisonFieldName=None,
         originalFieldName=None,
+        comparisonContourLineWidth=None,
         comparisonContourLineStyle=None,
         comparisonContourLineColor=None,
         labelContours=False,
         contourLabelPrecision=1,
-        maxTitleLength=70):  # {{{
+        maxTitleLength=70):
     """
     Plots a data set as a x distance (latitude, longitude,
     or spherical distance) vs depth map (vertical section).
@@ -687,7 +698,7 @@ def plot_vertical_section(
     yLim : float array, optional
         y range of plot
 
-    lineWidth : int, optional
+    lineWidth : float, optional
         the line width of contour lines (if specified)
 
     lineStyle : str, optional
@@ -782,6 +793,10 @@ def plot_vertical_section(
         contours on a contour comparison plot).  If contourComparisonField
         is None, this parameter is ignored.
 
+    comparisonContourLineWidth : float, optional
+        the line width of contour lines of the comparisonFieldName field on
+        a contour comparison plot
+
     comparisonContourLineStyle : str, optional
         the line style of contour lines of the comparisonFieldName field on
         a contour comparison plot
@@ -850,7 +865,6 @@ def plot_vertical_section(
 
         # compute moving averages with respect to the x dimension
         if movingAveragePoints is not None and movingAveragePoints != 1:
-
             dim = field.dims[0]
             field = field.rolling(dim={dim: movingAveragePoints},
                                   center=True).mean().dropna(dim)
@@ -862,6 +876,11 @@ def plot_vertical_section(
         mask = field.notnull()
         maskedTriangulation, unmaskedTriangulation = _get_triangulation(
             x, y, mask)
+        if contourComparisonField is not None:
+            mask = field.notnull()
+            maskedComparisonTriangulation, _ = _get_triangulation(x, y, mask)
+        else:
+            maskedComparisonTriangulation = None
     else:
         mask = field.notnull()
         triMask = np.logical_not(mask.values)
@@ -871,6 +890,15 @@ def plot_vertical_section(
         mask_args = dict(triangulation_args)
         mask_args['mask'] = triMask
         maskedTriangulation = Triangulation(**mask_args)
+        if contourComparisonField is not None:
+            mask = contourComparisonField.notnull()
+            triMask = np.logical_not(mask.values)
+            triMask = np.amax(triMask, axis=1)
+            mask_args = dict(triangulation_args)
+            mask_args['mask'] = triMask
+            maskedComparisonTriangulation = Triangulation(**mask_args)
+        else:
+            maskedComparisonTriangulation = None
 
     # set up figure
     if dpi is None:
@@ -934,7 +962,6 @@ def plot_vertical_section(
             plt.tricontour(unmaskedTriangulation, landMask, levels=[0.0001],
                            colors='black', linewidths=1)
 
-
     # plot contours, if they were requested
     contourLevels = colormapDict['contours']
     fmt_string = None
@@ -945,38 +972,56 @@ def plot_vertical_section(
         if len(contourLevels) == 0:
             # automatic calculation of contour levels
             contourLevels = None
-        cs1 = plt.tricontour(maskedTriangulation, field.values.ravel(),
+        mask = field.notnull()
+        fieldMasked = field.where(mask, 0.0).values.ravel()
+
+        cs1 = plt.tricontour(maskedTriangulation, fieldMasked,
                              levels=contourLevels,
                              colors=lineColor,
                              linestyles=lineStyle,
-                             linewidths=lineWidth)
+                             linewidths=lineWidth,
+                             cmap=contourColormap)
         if labelContours:
             fmt_string = "%%1.%df" % int(contourLabelPrecision)
             plt.clabel(cs1, fmt=fmt_string)
+
         if plotAsContours and contourComparisonField is not None:
-            cs2 = plt.tricontour(maskedTriangulation,
-                                 contourComparisonField.values.ravel(),
+            if comparisonContourLineWidth is None:
+                comparisonContourLineWidth = lineWidth
+            mask = contourComparisonField.notnull()
+            fieldMasked = contourComparisonField.where(mask, 0.0).values.ravel()
+            cs2 = plt.tricontour(maskedComparisonTriangulation,
+                                 fieldMasked,
                                  levels=contourLevels,
                                  colors=comparisonContourLineColor,
                                  linestyles=comparisonContourLineStyle,
-                                 linewidths=lineWidth)
+                                 linewidths=comparisonContourLineWidth,
+                                 cmap=contourColormap)
+
             if labelContours:
                 plt.clabel(cs2, fmt=fmt_string)
 
-    if plotAsContours and contourComparisonField is not None:
+    plotLegend = (((lineColor is not None and
+                    comparisonContourLineColor is not None) or
+                   (lineWidth is not None and
+                    comparisonContourLineWidth is not None)) and
+                  (plotAsContours and contourComparisonField is not None))
+
+    if plotLegend:
         h1, _ = cs1.legend_elements()
         h2, _ = cs2.legend_elements()
         if labelContours:
             originalFieldName = originalFieldName + " (" + colorbarLabel + ")"
-            comparisonFieldName = comparisonFieldName + " (" + \
-                colorbarLabel + ")"
+            comparisonFieldName = (comparisonFieldName + " (" +
+                                   colorbarLabel + ")")
         ax.legend([h1[0], h2[0]], [originalFieldName, comparisonFieldName],
-                  loc='upper center', bbox_to_anchor=(0.5, -0.25), ncol=1)
+                  loc='upper center', bbox_to_anchor=(0.5, -0.15), ncol=1)
 
     if title is not None:
         if plotAsContours and labelContours \
                 and contourComparisonField is None:
-            title = limit_title(title, maxTitleLength-(3+len(colorbarLabel)))
+            title = limit_title(title,
+                                maxTitleLength - (3 + len(colorbarLabel)))
             title = title + " (" + colorbarLabel + ")"
         else:
             title = limit_title(title, maxTitleLength)
@@ -1017,6 +1062,15 @@ def plot_vertical_section(
         plot_xtick_format(calendar, minDays, maxDays, maxXTicks,
                           yearStride=yearStrideXTicks)
 
+    if contourLevels is not None:
+        if contourColormap is not None:
+            cbar1 = fig.colorbar(cs1, ax=ax, fraction=.05,
+                                 orientation='vertical',
+                                 spacing='proportional')
+
+            if colorbarLabel is not None:
+                cbar1.set_label(colorbarLabel)
+
     # add a second x-axis scale, if it was requested
     if xCoords is not None and len(xCoords) >= 2:
         ax2 = ax.twiny()
@@ -1050,7 +1104,7 @@ def plot_vertical_section(
                                      for member in tickValues])
                 ax3.spines['top'].set_position(('outward', 36))
 
-    return fig, ax  # }}}
+    return fig, ax
 
 
 def _get_triangulation(x, y, mask):
@@ -1058,7 +1112,7 @@ def _get_triangulation(x, y, mask):
 
     nx = x.sizes[x.dims[0]] - 1
     ny = x.sizes[x.dims[1]] - 1
-    nTriangles = 2*nx*ny
+    nTriangles = 2 * nx * ny
 
     mask = mask.values
     mask = np.logical_and(np.logical_and(mask[0:-1, 0:-1], mask[1:, 0:-1]),
@@ -1074,13 +1128,13 @@ def _get_triangulation(x, y, mask):
 
     tris = np.zeros((nx, ny, 2, 3), int)
     # upper triangles:
-    tris[:, :, 0, 0] = (ny+1)*xIndices + yIndices
-    tris[:, :, 0, 1] = (ny+1)*(xIndices + 1) + yIndices
-    tris[:, :, 0, 2] = (ny+1)*xIndices + yIndices + 1
+    tris[:, :, 0, 0] = (ny + 1) * xIndices + yIndices
+    tris[:, :, 0, 1] = (ny + 1) * (xIndices + 1) + yIndices
+    tris[:, :, 0, 2] = (ny + 1) * xIndices + yIndices + 1
     # lower triangle
-    tris[:, :, 1, 0] = (ny+1)*xIndices + yIndices + 1
-    tris[:, :, 1, 1] = (ny+1)*(xIndices + 1) + yIndices
-    tris[:, :, 1, 2] = (ny+1)*(xIndices + 1) + yIndices + 1
+    tris[:, :, 1, 0] = (ny + 1) * xIndices + yIndices + 1
+    tris[:, :, 1, 1] = (ny + 1) * (xIndices + 1) + yIndices
+    tris[:, :, 1, 2] = (ny + 1) * (xIndices + 1) + yIndices + 1
 
     tris = tris.reshape((nTriangles, 3))
 
@@ -1091,5 +1145,3 @@ def _get_triangulation(x, y, mask):
     unmaskedTriangulation = Triangulation(x=x, y=y, triangles=tris)
 
     return maskedTriangulation, unmaskedTriangulation
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/projection/__init__.py b/mpas_analysis/shared/projection/__init__.py
index 0a2bf4f43..110a3d6c3 100644
--- a/mpas_analysis/shared/projection/__init__.py
+++ b/mpas_analysis/shared/projection/__init__.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
diff --git a/mpas_analysis/shared/regions/compute_region_masks.py b/mpas_analysis/shared/regions/compute_region_masks.py
index dd7673ebc..d5031847a 100644
--- a/mpas_analysis/shared/regions/compute_region_masks.py
+++ b/mpas_analysis/shared/regions/compute_region_masks.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -31,7 +31,7 @@ def __init__(self, config, conponentName):
 
         Parameters
         ----------
-        config :  ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Configuration options
 
         conponentName : str
@@ -92,9 +92,7 @@ def add_mask_subtask(self, regionGroup, obsFileName=None, lonVar='lon',
 
         if key not in self.regionMaskSubtasks:
 
-            subprocessCount = config.getWithDefault('execute',
-                                                    'parallelTaskCount',
-                                                    default=1)
+            subprocessCount = config.getint('execute', 'parallelTaskCount')
 
             if obsFileName is not None:
                 useMpasMaskCreator = False
diff --git a/mpas_analysis/shared/regions/compute_region_masks_subtask.py b/mpas_analysis/shared/regions/compute_region_masks_subtask.py
index 8ccd52b1f..0bd4ca494 100644
--- a/mpas_analysis/shared/regions/compute_region_masks_subtask.py
+++ b/mpas_analysis/shared/regions/compute_region_masks_subtask.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -93,7 +93,7 @@ def compute_lon_lat_region_masks(gridFileName, lonVar, latVar, geojsonFileName,
     check_call(args=args, logger=logger)
 
 
-class ComputeRegionMasksSubtask(AnalysisTask):  # {{{
+class ComputeRegionMasksSubtask(AnalysisTask):
     """
     An analysis tasks for computing cell masks for regions defined by geojson
     features
@@ -129,6 +129,7 @@ class ComputeRegionMasksSubtask(AnalysisTask):  # {{{
         The name of the mesh or grid, used as part of the mask file name.
         Default is the MPAS mesh name
     """
+
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -136,7 +137,7 @@ class ComputeRegionMasksSubtask(AnalysisTask):  # {{{
     def __init__(self, parentTask, regionGroup, meshName, subprocessCount=1,
                  obsFileName=None, lonVar='lon', latVar='lat',
                  useMpasMaskCreator=False):
-        # {{{
+
         """
         Construct the analysis task and adds it as a subtask of the
         ``parentTask``.
@@ -211,8 +212,6 @@ def __init__(self, parentTask, regionGroup, meshName, subprocessCount=1,
 
         parentTask.add_subtask(self)
 
-        # }}}
-
     def make_region_mask(self):
         """
         If the geojson mask file has not already been cached in the diagnostics
@@ -246,7 +245,7 @@ def expand_region_names(self, regionNames):
             regionNames = get_feature_list(self.geojsonFileName)
         return regionNames
 
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
 
@@ -295,9 +294,8 @@ def setup_and_check(self):  # {{{
         if os.path.exists(self.maskFileName):
             # nothing to do so don't block a bunch of other processes
             self.subprocessCount = 1
-        # }}}
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Compute the requested climatologies
         """
@@ -332,7 +330,3 @@ def run_task(self):  # {{{
                 self.geojsonFileName, self.maskFileName, self.logger,
                 self.subprocessCount,
                 multiprocessingMethod=multiprocessingMethod)
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/time_series/anomaly.py b/mpas_analysis/shared/time_series/anomaly.py
index 21411ccc6..0f75fdcaf 100644
--- a/mpas_analysis/shared/time_series/anomaly.py
+++ b/mpas_analysis/shared/time_series/anomaly.py
@@ -1,19 +1,16 @@
 # -*- coding: utf-8 -*-
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 #
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 from mpas_analysis.shared.io import open_mpas_dataset
 from mpas_analysis.shared.time_series.moving_average import compute_moving_avg
 
@@ -22,8 +19,8 @@ def compute_moving_avg_anomaly_from_start(timeSeriesFileName, variableList,
                                           anomalyStartTime, anomalyEndTime,
                                           startDate, endDate, calendar,
                                           movingAveragePoints=12,
-                                          alter_dataset=None):  # {{{
-    '''
+                                          alter_dataset=None):
+    """
     Compute the rolling mean of the anomaly of a quantity from the beginning
     of the simulation (such that the rolling mean starts at zero by definition)
 
@@ -58,7 +55,7 @@ def compute_moving_avg_anomaly_from_start(timeSeriesFileName, variableList,
     -------
     ds : ``xarray.Dataset``
         The anomaly of the rolling time mean from the start of the simulation
-    '''
+    """
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -91,6 +88,3 @@ def compute_moving_avg_anomaly_from_start(timeSeriesFileName, variableList,
 
     return ds
 
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/time_series/moving_average.py b/mpas_analysis/shared/time_series/moving_average.py
index e8a7da62b..025328cdc 100644
--- a/mpas_analysis/shared/time_series/moving_average.py
+++ b/mpas_analysis/shared/time_series/moving_average.py
@@ -1,22 +1,19 @@
 # -*- coding: utf-8 -*-
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 #
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
 
-
-def compute_moving_avg(ds, movingAveragePoints=12):  # {{{
-    '''
+def compute_moving_avg(ds, movingAveragePoints=12):
+    """
     Compute the rolling mean of a data set
 
     Parameters
@@ -32,7 +29,7 @@ def compute_moving_avg(ds, movingAveragePoints=12):  # {{{
     -------
     ds : ``xarray.Dataset``
         The anomaly of the rolling time mean from the start of the simulation
-    '''
+    """
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -42,6 +39,3 @@ def compute_moving_avg(ds, movingAveragePoints=12):  # {{{
 
     return ds
 
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/time_series/mpas_time_series_task.py b/mpas_analysis/shared/time_series/mpas_time_series_task.py
index 307a45fad..ff26869c3 100644
--- a/mpas_analysis/shared/time_series/mpas_time_series_task.py
+++ b/mpas_analysis/shared/time_series/mpas_time_series_task.py
@@ -1,17 +1,14 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import os
 import subprocess
 from distutils.spawn import find_executable
@@ -25,8 +22,8 @@
 from mpas_analysis.shared.timekeeping.utility import get_simulation_start_time
 
 
-class MpasTimeSeriesTask(AnalysisTask):  # {{{
-    '''
+class MpasTimeSeriesTask(AnalysisTask):
+    """
     An analysis tasks for computing time series from output from the
     ``timeSeriesStatsMonthly`` analysis member.
 
@@ -49,19 +46,20 @@ class MpasTimeSeriesTask(AnalysisTask):  # {{{
 
     startYear, endYear : int
         The start and end years of the time series
-    '''
+    """
+
     # Authors
     # -------
     # Xylar Asay-Davis
 
     def __init__(self, config, componentName, taskName=None,
-                 subtaskName=None, section='timeSeries'):  # {{{
-        '''
+                 subtaskName=None, section='timeSeries'):
+        """
         Construct the analysis task for extracting time series.
 
         Parameters
         ----------
-        config : ``MpasAnalysisConfigParser``
+        config : mpas_tools.config.MpasConfigParser
             Contains configuration options
 
         componentName : {'ocean', 'seaIce'}
@@ -78,7 +76,7 @@ def __init__(self, config, componentName, taskName=None,
         section : str, optional
             The section of the config file from which to read the start and
             end times for the time series, also added as a tag
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -91,7 +89,7 @@ def __init__(self, config, componentName, taskName=None,
 
         if taskName is None:
             suffix = section[0].upper() + section[1:] + \
-                componentName[0].upper() + componentName[1:]
+                     componentName[0].upper() + componentName[1:]
             taskName = 'mpas{}'.format(suffix)
 
         # call the constructor from the base class (AnalysisTask)
@@ -102,10 +100,8 @@ def __init__(self, config, componentName, taskName=None,
             componentName=componentName,
             tags=tags)
 
-        # }}}
-
-    def add_variables(self, variableList):  # {{{
-        '''
+    def add_variables(self, variableList):
+        """
         Add one or more variables to extract as a time series.
 
         Parameters
@@ -121,7 +117,7 @@ def add_variables(self, variableList):  # {{{
             the list of available variables has not yet been set) or if one
             or more of the requested variables is not available in the
             ``timeSeriesStatsMonthly`` output.
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -142,12 +138,10 @@ def add_variables(self, variableList):  # {{{
             if variable not in self.variableList:
                 self.variableList.append(variable)
 
-        # }}}
-
-    def setup_and_check(self):  # {{{
-        '''
+    def setup_and_check(self):
+        """
         Perform steps to set up the analysis and check for errors in the setup.
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -185,11 +179,10 @@ def setup_and_check(self):  # {{{
             raise IOError('No files were found in stream {} between {} and '
                           '{}.'.format(streamName, startDate, endDate))
 
-        self.runMessage = '\nComputing MPAS time series from first year ' \
-                          'plus files:\n' \
-                          '    {} through\n    {}'.format(
-                              os.path.basename(self.inputFiles[0]),
-                              os.path.basename(self.inputFiles[-1]))
+        self.runMessage = \
+            f'\nComputing MPAS time series from first year plus files:\n' \
+            f'    {os.path.basename(self.inputFiles[0])} through\n' \
+            f'    {os.path.basename(self.inputFiles[-1])}'
 
         # Make sure first year of data is included for computing anomalies
         if config.has_option('timeSeries', 'anomalyRefYear'):
@@ -213,12 +206,10 @@ def setup_and_check(self):  # {{{
         with xr.open_dataset(self.inputFiles[0]) as ds:
             self.allVariables = list(ds.data_vars.keys())
 
-        # }}}
-
-    def run_task(self):  # {{{
-        '''
+    def run_task(self):
+        """
         Compute the requested time series
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -231,11 +222,9 @@ def run_task(self):  # {{{
 
         self._compute_time_series_with_ncrcat()
 
-        # }}}
-
     def _compute_time_series_with_ncrcat(self):
-        # {{{
-        '''
+
+        """
         Uses ncrcat to extact time series from timeSeriesMonthlyOutput files
 
         Raises
@@ -246,7 +235,7 @@ def _compute_time_series_with_ncrcat(self):
         Author
         ------
         Xylar Asay-Davis
-        '''
+        """
 
         if find_executable('ncrcat') is None:
             raise OSError('ncrcat not found. Make sure the latest nco '
@@ -343,9 +332,3 @@ def _compute_time_series_with_ncrcat(self):
         if process.returncode != 0:
             raise subprocess.CalledProcessError(process.returncode,
                                                 ' '.join(args))
-
-        # }}}
-    # }}}
-
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/time_series/time_series.py b/mpas_analysis/shared/time_series/time_series.py
index 4546811e6..4f6e3efd4 100644
--- a/mpas_analysis/shared/time_series/time_series.py
+++ b/mpas_analysis/shared/time_series/time_series.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -15,24 +15,19 @@
 # -------
 # Xylar Asay-Davis
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import xarray as xr
 import numpy
 import os
 from distutils.spawn import find_executable
 import glob
 import subprocess
-from six import string_types
 
 from mpas_analysis.shared.timekeeping.utility import days_to_datetime
 
 
 def combine_time_series_with_ncrcat(inFileNames, outFileName,
                                     variableList=None, logger=None):
-    # {{{
-    '''
+    """
     Uses ncrcat to extact time series from a series of files
 
     inFileNames : str or list of str
@@ -56,7 +51,7 @@ def combine_time_series_with_ncrcat(inFileNames, outFileName,
     Author
     ------
     Xylar Asay-Davis
-    '''
+    """
 
     if find_executable('ncrcat') is None:
         raise OSError('ncrcat not found. Make sure the latest nco '
@@ -68,7 +63,7 @@ def combine_time_series_with_ncrcat(inFileNames, outFileName,
     if os.path.exists(outFileName):
         return
 
-    if isinstance(inFileNames, string_types):
+    if isinstance(inFileNames, str):
         inFileNames = sorted(glob.glob(inFileNames))
 
     args = ['ncrcat', '-4', '--record_append', '--no_tmp_fl']
@@ -111,13 +106,11 @@ def combine_time_series_with_ncrcat(inFileNames, outFileName,
         raise subprocess.CalledProcessError(process.returncode,
                                             ' '.join(args))
 
-    # }}}
-
 
 def cache_time_series(timesInDataSet, timeSeriesCalcFunction, cacheFileName,
                       calendar, yearsPerCacheUpdate=1,
-                      logger=None):  # {{{
-    '''
+                      logger=None):
+    """
     Create or update a NetCDF file ``cacheFileName`` containing the given time
     series, calculated with ``timeSeriesCalcFunction`` over the given times,
     start and end year, and time frequency with which results are cached.
@@ -161,7 +154,7 @@ def cache_time_series(timesInDataSet, timeSeriesCalcFunction, cacheFileName,
         A data set without the ``'Time'`` coordinate containing the mean
         of ds over all months in monthValues, weighted by the number of days
         in each month.
-    '''
+    """
     # Authors
     # -------
     # Xylar Asay-Davis
@@ -239,7 +232,3 @@ def cache_time_series(timesInDataSet, timeSeriesCalcFunction, cacheFileName,
         dsCache.to_netcdf(cacheFileName)
 
     return dsCache.sel(Time=slice(timesInDataSet[0], timesInDataSet[-1]))
-
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/timekeeping/MpasRelativeDelta.py b/mpas_analysis/shared/timekeeping/MpasRelativeDelta.py
index 3be676a5c..7ff0b70e7 100644
--- a/mpas_analysis/shared/timekeeping/MpasRelativeDelta.py
+++ b/mpas_analysis/shared/timekeeping/MpasRelativeDelta.py
@@ -1,17 +1,14 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import datetime
 from dateutil.relativedelta import relativedelta
 from calendar import monthrange, isleap
@@ -161,5 +158,3 @@ def __repr__(self):
         outList.append("calendar='{}'".format(self.calendar))
         return "{classname}({attrs})".format(classname=self.__class__.__name__,
                                              attrs=", ".join(outList))
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/timekeeping/utility.py b/mpas_analysis/shared/timekeeping/utility.py
index 172637c48..bdae07da2 100644
--- a/mpas_analysis/shared/timekeeping/utility.py
+++ b/mpas_analysis/shared/timekeeping/utility.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -15,14 +15,10 @@
 # -------
 # Xylar Asay-Davis
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import datetime
 import netCDF4
 import xarray
 import numpy
-import six
 
 from mpas_analysis.shared.timekeeping.MpasRelativeDelta import \
     MpasRelativeDelta
@@ -72,7 +68,7 @@ def get_simulation_start_time(streams):
     return simulationStartTime
 
 
-def string_to_datetime(dateString):  # {{{
+def string_to_datetime(dateString):
     """
     Given a date string and a calendar, returns a ``datetime.datetime``
 
@@ -113,10 +109,10 @@ def string_to_datetime(dateString):  # {{{
         _parse_date_string(dateString, isInterval=False)
 
     return datetime.datetime(year=year, month=month, day=day, hour=hour,
-                             minute=minute, second=second)  # }}}
+                             minute=minute, second=second)
 
 
-def string_to_relative_delta(dateString, calendar='gregorian'):  # {{{
+def string_to_relative_delta(dateString, calendar='gregorian'):
     """
     Given a date string and a calendar, returns an instance of
     ``MpasRelativeDelta``
@@ -163,7 +159,6 @@ def string_to_relative_delta(dateString, calendar='gregorian'):  # {{{
     return MpasRelativeDelta(years=years, months=months, days=days,
                              hours=hours, minutes=minutes, seconds=seconds,
                              calendar=calendar)
-    # }}}
 
 
 def string_to_days_since_date(dateString, calendar='gregorian',
@@ -218,7 +213,7 @@ def string_to_days_since_date(dateString, calendar='gregorian',
     # -------
     # Xylar Asay-Davis
 
-    isSingleString = isinstance(dateString, six.string_types)
+    isSingleString = isinstance(dateString, str)
 
     if isSingleString:
         dateString = [dateString]
@@ -379,7 +374,7 @@ def date_to_days(year=1, month=1, day=1, hour=0, minute=0, second=0,
                             calendar=calendar)
 
 
-def _parse_date_string(dateString, isInterval=False):  # {{{
+def _parse_date_string(dateString, isInterval=False):
     """
     Given a string containing a date, returns a tuple defining a date of the
     form (year, month, day, hour, minute, second) appropriate for constructing
@@ -464,7 +459,7 @@ def _parse_date_string(dateString, isInterval=False):  # {{{
         second = int(hms)
         minute = 0
         hour = 0
-    return (year, month, day, hour, minute, second)  # }}}
+    return (year, month, day, hour, minute, second)
 
 
 def _mpas_to_netcdf_calendar(calendar):
@@ -494,5 +489,3 @@ def _round_datetime(date):
     add_seconds = int(1e-6 * microsecond + 0.5)
 
     return date + datetime.timedelta(0, add_seconds)
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/shared/transects/compute_transect_masks_subtask.py b/mpas_analysis/shared/transects/compute_transect_masks_subtask.py
index a6a2f16b2..0c410c863 100644
--- a/mpas_analysis/shared/transects/compute_transect_masks_subtask.py
+++ b/mpas_analysis/shared/transects/compute_transect_masks_subtask.py
@@ -1,17 +1,14 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
 # https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import os
 import xarray as xr
 
@@ -64,7 +61,7 @@ def compute_mpas_transect_masks(geojsonFileName, meshFileName, maskFileName,
         check_call(args, logger=logger)
 
 
-class ComputeTransectMasksSubtask(AnalysisTask):  # {{{
+class ComputeTransectMasksSubtask(AnalysisTask):
     """
     An analysis tasks for computing cell masks for transects defined by geojson
     features
@@ -90,7 +87,7 @@ class ComputeTransectMasksSubtask(AnalysisTask):  # {{{
     # Xylar Asay-Davis
 
     def __init__(self, parentTask, transectGroup, subprocessCount=None):
-        # {{{
+
         """
         Construct the analysis task and adds it as a subtask of the
         ``parentTask``.
@@ -124,8 +121,8 @@ def __init__(self, parentTask, transectGroup, subprocessCount=None):
             tags=[])
 
         if subprocessCount is None:
-            self.subprocessCount = self.config.getWithDefault(
-                'execute', 'parallelTaskCount', default=1)
+            self.subprocessCount = self.config.getint(
+                'execute', 'parallelTaskCount')
         else:
             self.subprocessCount = subprocessCount
 
@@ -140,7 +137,6 @@ def __init__(self, parentTask, transectGroup, subprocessCount=None):
         self.geojsonFileName = \
             get_region_mask(self.config,
                             '{}.geojson'.format(self.outFileSuffix))
-        # }}}
 
     def make_transect_mask(self):
         """
@@ -175,7 +171,7 @@ def expand_transect_names(self, transectNames):
             transectNames = get_feature_list(self.geojsonFileName)
         return transectNames
 
-    def setup_and_check(self):  # {{{
+    def setup_and_check(self):
         """
         Perform steps to set up the analysis and check for errors in the setup.
 
@@ -226,9 +222,8 @@ def setup_and_check(self):  # {{{
         if os.path.exists(self.maskFileName):
             # nothing to do so don't block a bunch of other processes
             self.subprocessCount = 1
-        # }}}
 
-    def run_task(self):  # {{{
+    def run_task(self):
         """
         Compute the requested climatologies
         """
@@ -247,6 +242,3 @@ def run_task(self):  # {{{
             logger=self.logger, processCount=self.subprocessCount,
             dir=self.maskSubdirectory)
 
-    # }}}
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/test/__init__.py b/mpas_analysis/test/__init__.py
index bdd789373..7788d1aa9 100644
--- a/mpas_analysis/test/__init__.py
+++ b/mpas_analysis/test/__init__.py
@@ -5,9 +5,6 @@
 04/06/2017
 """
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import warnings
 from contextlib import contextmanager
 
@@ -47,11 +44,11 @@ def requires_numpy(test):
 # http://stackoverflow.com/questions/29627341/pytest-where-to-store-expected-data
 @fixture
 def loaddatadir(request, tmpdir):
-    '''
+    """
     Fixture responsible for searching a folder with the same name of test
     module and, if available, moving all contents to a temporary directory so
     tests can use them freely.
-    '''
+    """
     filename = request.module.__file__
     test_dir, _ = os.path.splitext(filename)
 
diff --git a/mpas_analysis/test/test_analysis_task.py b/mpas_analysis/test/test_analysis_task.py
index c521ac234..e88ade3c7 100644
--- a/mpas_analysis/test/test_analysis_task.py
+++ b/mpas_analysis/test/test_analysis_task.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -14,13 +14,12 @@
 Xylar Asay-Davis
 """
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import pytest
+
+from mpas_tools.config import MpasConfigParser
+
 from mpas_analysis.test import TestCase
 from mpas_analysis.shared.analysis_task import AnalysisTask
-from mpas_analysis.configuration import MpasAnalysisConfigParser
 
 
 class TestAnalysisTask(TestCase):
@@ -28,8 +27,7 @@ class TestAnalysisTask(TestCase):
     def test_checkGenerate(self):
 
         def doTest(generate, expectedResults):
-            config = MpasAnalysisConfigParser()
-            config.add_section('output')
+            config = MpasConfigParser()
             config.set('output', 'generate', generate)
             for taskName in expectedResults:
                 genericTask = AnalysisTask(config=config,
@@ -167,5 +165,3 @@ def doTest(generate, expectedResults):
         expectedResults['timeSeriesOHC'] = False
         doTest("['all', 'no_timeSeriesOHC']", expectedResults)
 
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/test/test_climatology.py b/mpas_analysis/test/test_climatology.py
index bcfa4d9f3..98f251cca 100644
--- a/mpas_analysis/test/test_climatology.py
+++ b/mpas_analysis/test/test_climatology.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -15,9 +15,6 @@
 04/11/2017
 """
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import pytest
 import tempfile
 import shutil
@@ -26,10 +23,11 @@
 import xarray
 from pyremap import MpasMeshDescriptor, LatLonGridDescriptor
 
+from mpas_tools.config import MpasConfigParser
+
 from mpas_analysis.test import TestCase, loaddatadir
 from mpas_analysis.shared.generalized_reader.generalized_reader \
     import open_multifile_dataset
-from mpas_analysis.configuration import MpasAnalysisConfigParser
 from mpas_analysis.shared.climatology import \
     get_comparison_descriptor, get_remapper, \
     add_years_months_days_in_month, compute_climatology, \
@@ -49,26 +47,22 @@ def tearDown(self):
         shutil.rmtree(self.test_dir)
 
     def setup_config(self, maxChunkSize=10000):
-        config = MpasAnalysisConfigParser()
+        config = MpasConfigParser()
 
-        config.add_section('execute')
         config.set('execute', 'mapParallelExec', 'None')
+        config.set('execute', 'mapMpiTasks', '1')
 
-        config.add_section('diagnostics')
         config.set('diagnostics', 'base_path', self.test_dir)
         config.set('diagnostics', 'customDirectory', 'none')
         config.set('diagnostics', 'mappingSubdirectory', 'maps')
 
-        config.add_section('input')
         config.set('input', 'maxChunkSize', str(maxChunkSize))
         config.set('input', 'mpasMeshName', 'QU240')
 
-        config.add_section('output')
         config.set('output', 'baseDirectory', self.test_dir)
         config.set('output', 'mappingSubdirectory', '.')
         config.set('output', 'mpasClimatologySubdirectory', 'clim/mpas')
 
-        config.add_section('climatology')
         config.set('climatology', 'startYear', '2')
         config.set('climatology', 'endYear', '2')
         config.set('climatology', 'comparisonLatResolution', '0.5')
@@ -76,7 +70,6 @@ def setup_config(self, maxChunkSize=10000):
 
         config.set('climatology', 'mpasInterpolationMethod', 'bilinear')
 
-        config.add_section('oceanObservations')
         config.set('oceanObservations', 'interpolationMethod', 'bilinear')
         config.set('oceanObservations', 'climatologySubdirectory', 'clim/obs')
         config.set('oceanObservations', 'remappedClimSubdirectory',
@@ -262,5 +255,3 @@ def test_compute_monthly_climatology(self):
         self.assertArrayApproxEqual(monthlyClimatology.month.values,
                                     refClimatology.month.values)
 
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/test/test_generalized_reader.py b/mpas_analysis/test/test_generalized_reader.py
index 5fb20a995..296cba8d1 100644
--- a/mpas_analysis/test/test_generalized_reader.py
+++ b/mpas_analysis/test/test_generalized_reader.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -15,23 +15,21 @@
 02/16/2017
 """
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import numpy
 import pytest
+
+from mpas_tools.config import MpasConfigParser
+
 from mpas_analysis.test import TestCase, loaddatadir
 from mpas_analysis.shared.generalized_reader.generalized_reader \
     import open_multifile_dataset
-from mpas_analysis.configuration import MpasAnalysisConfigParser
 
 
 @pytest.mark.usefixtures("loaddatadir")
 class TestGeneralizedReader(TestCase):
 
     def setup_config(self, maxChunkSize=10000):
-        config = MpasAnalysisConfigParser()
-        config.add_section('input')
+        config = MpasConfigParser()
         config.set('input', 'maxChunkSize', str(maxChunkSize))
         return config
 
@@ -132,5 +130,3 @@ def test_start_end(self):
                 startDate='0005-02-01',
                 endDate='0005-03-01')
             self.assertEqual(len(ds.Time), 1)
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/test/test_io_utility.py b/mpas_analysis/test/test_io_utility.py
index 3b1ddf63c..a201cc184 100644
--- a/mpas_analysis/test/test_io_utility.py
+++ b/mpas_analysis/test/test_io_utility.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -15,9 +15,6 @@
 10/07/2016
 """
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import os
 import pytest
 from mpas_analysis.test import TestCase, loaddatadir
@@ -32,5 +29,3 @@ def test_paths(self):
                          ['0.txt', '1.txt', '2.txt', 'a.txt', 'b.txt',
                           'c.txt'])
 
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/test/test_mpas_climatology_task.py b/mpas_analysis/test/test_mpas_climatology_task.py
index 36c438b6c..4ed49717a 100644
--- a/mpas_analysis/test/test_mpas_climatology_task.py
+++ b/mpas_analysis/test/test_mpas_climatology_task.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -14,16 +14,14 @@
 Xylar Asay-Davis
 """
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import pytest
 import tempfile
 import shutil
 import os
 
+from mpas_tools.config import MpasConfigParser
+
 from mpas_analysis.test import TestCase, loaddatadir
-from mpas_analysis.configuration import MpasAnalysisConfigParser
 from mpas_analysis.shared.climatology import MpasClimatologyTask, \
     RemapMpasClimatologySubtask
 from mpas_analysis.shared import AnalysisTask
@@ -46,8 +44,8 @@ def tearDown(self):
 
     def setup_config(self):
         configPath = self.datadir.join('QU240.cfg')
-        config = MpasAnalysisConfigParser()
-        config.read(str(configPath))
+        config = MpasConfigParser()
+        config.add_from_file(str(configPath))
         config.set('input', 'baseDirectory', str(self.datadir))
         config.set('output', 'baseDirectory', str(self.test_dir))
         return config
diff --git a/mpas_analysis/test/test_mpas_climatology_task/QU240.cfg b/mpas_analysis/test/test_mpas_climatology_task/QU240.cfg
index 25dbeef8d..ae43c0a7c 100644
--- a/mpas_analysis/test/test_mpas_climatology_task/QU240.cfg
+++ b/mpas_analysis/test/test_mpas_climatology_task/QU240.cfg
@@ -5,6 +5,7 @@ mainRunName = runName
 parallelTaskCount = 1
 ncclimoParallelMode = serial
 mapParallelExec = None
+mapMpiTasks = 1
 ncremapParallelExec = None
 
 [diagnostics]
diff --git a/mpas_analysis/test/test_mpas_config_parser.py b/mpas_analysis/test/test_mpas_config_parser.py
deleted file mode 100644
index 516012381..000000000
--- a/mpas_analysis/test/test_mpas_config_parser.py
+++ /dev/null
@@ -1,143 +0,0 @@
-# This software is open source software available under the BSD-3 license.
-#
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
-# reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
-#
-# Additional copyright and license information can be found in the LICENSE file
-# distributed with this code, or at
-# https://raw.githubusercontent.com/MPAS-Dev/MPAS-Analysis/master/LICENSE
-"""
-Unit test infrastructure for MpasAnalysisConfigParser
-
-Xylar Asay-Davis, Phillip J. Wolfram
-01/31/2017
-"""
-
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
-import pytest
-import six
-from six.moves import configparser
-from mpas_analysis.test import TestCase, loaddatadir
-from mpas_analysis.configuration import MpasAnalysisConfigParser
-from mpas_analysis.test import requires_numpy
-
-
-@pytest.mark.usefixtures("loaddatadir")
-class TestMPASAnalysisConfigParser(TestCase):
-    def setup_config(self):
-        configPath = self.datadir.join('analysis.cfg')
-        self.config = MpasAnalysisConfigParser()
-        self.config.read(str(configPath))
-
-    def check_container(self, container, container_type, item_type):
-        assert isinstance(container, container_type)
-        for item in container:
-            assert isinstance(item, item_type)
-
-    def test_read_config(self):
-        self.setup_config()
-
-        colorMapName = self.config.get('sst_modelvsobs', 'cmapDiff')
-        self.assertEqual(colorMapName, 'coolwarm')
-
-        self.assertEqual(self.config.getint('Test', 'testInt'), 15)
-        self.assertEqual(self.config.getExpression('Test', 'testInt'), 15)
-
-        self.assertEqual(self.config.getfloat('Test', 'testFloat'), 18.0)
-        self.assertEqual(self.config.getExpression('Test', 'testFloat'), 18.0)
-
-        self.assertEqual(self.config.getfloat('Test', 'testFloat2'), 3.)
-        self.assertEqual(self.config.getExpression('Test', 'testFloat2'), 3.)
-
-        self.assertEqual(self.config.getboolean('Test', 'testBool'), True)
-        self.assertEqual(self.config.getExpression('Test', 'testBool'), True)
-
-        testList = self.config.getExpression('sst_modelvsobs',
-                                             'cmapIndicesModelObs')
-        self.check_container(testList, list, int)
-        self.assertEqual(testList, [0, 40, 80, 110, 140, 170, 200, 230, 255])
-
-        testList = self.config.getExpression('sst_modelvsobs',
-                                             'cmapIndicesModelObs',
-                                             elementType=float)
-        self.check_container(testList, list, float)
-        self.assertEqual(testList, [0., 40., 80., 110., 140., 170., 200.,
-                                    230., 255.])
-
-        testList = self.config.getExpression('sst_modelvsobs',
-                                             'comparisonTimes')
-        self.check_container(testList, list, str)
-        self.assertEqual(testList, ['JFM', 'JAS', 'ANN'])
-
-        testList = self.config.getExpression('Test', 'testList')
-        self.check_container(testList, list, float)
-        self.assertEqual(testList, [0.5, 0.1, 0.5])
-
-        testTuple = self.config.getExpression('Test', 'testTuple')
-        assert isinstance(testTuple, tuple)
-        self.assertEqual(testTuple, (5, 0.1, 'string'))
-
-        testDict = self.config.getExpression('Test', 'testDict')
-        assert isinstance(testDict, dict)
-        self.assertEqual(testDict, {'key1': 'string',
-                                    'key2': -12,
-                                    'key3': False})
-
-        with six.assertRaisesRegex(
-                self,
-                configparser.NoOptionError,
-                "No option 'doesntexist' in section: 'Test'"):
-            self.config.getExpression(str('Test'), str('doesntexist'))
-
-    @requires_numpy
-    def test_read_config_numpy(self):
-        self.setup_config()
-
-        # tests numpy evaluation capability
-        import numpy as np
-        for testname in ['testNumpyarange' + str(ii) for ii in np.arange(3)]:
-            self.assertArrayEqual(self.config.getExpression('TestNumpy',
-                                                            testname,
-                                                            usenumpyfunc=True),
-                                  np.arange(0, 1, 10))
-        for testname in ['testNumpylinspace' + str(ii) for ii in np.arange(3)]:
-            self.assertArrayEqual(self.config.getExpression('TestNumpy',
-                                                            testname,
-                                                            usenumpyfunc=True),
-                                  np.linspace(0, 1, 10))
-        for testNumpy in ['testNumpypi' + str(ii) for ii in np.arange(3)] + \
-                ['testNumpyPi']:
-            self.assertEqual(self.config.getExpression('TestNumpy', testNumpy,
-                                                       usenumpyfunc=True),
-                             np.pi)
-        with six.assertRaisesRegex(
-                self,
-                AssertionError,
-                "'__' is not allowed in .* for `usenumpyfunc=True`"):
-            self.config.getExpression('TestNumpy', 'testBadStr',
-                                      usenumpyfunc=True),
-
-    def test_get_with_default(self):
-        self.setup_config()
-
-        def check_get_with_default(name, value, dtype):
-            # test an options that doesn't exist using getWithDefault
-            var = self.config.getWithDefault('sst_modelvsobs', name, value)
-            assert isinstance(var, dtype)
-            self.assertEqual(var, value)
-
-        # test several types with getWithDefault
-        check_get_with_default(name='aBool', value=True, dtype=bool)
-        check_get_with_default(name='anInt', value=1, dtype=six.integer_types)
-        check_get_with_default(name='aFloat', value=1.0, dtype=float)
-        check_get_with_default(name='aList', value=[1, 2, 3], dtype=list)
-        check_get_with_default(name='aTuple', value=(1, 2, 3), dtype=tuple)
-        check_get_with_default(name='aDict', value={'blah': 1}, dtype=dict)
-        check_get_with_default(name='aStr', value='blah',
-                               dtype=six.string_types)
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/test/test_mpas_config_parser/analysis.cfg b/mpas_analysis/test/test_mpas_config_parser/analysis.cfg
deleted file mode 100644
index b6c999a33..000000000
--- a/mpas_analysis/test/test_mpas_config_parser/analysis.cfg
+++ /dev/null
@@ -1,47 +0,0 @@
-[sst_modelvsobs]
-# colormap for model/observations
-cmapModelObs = RdYlBu_r
-# colormap for differences
-cmapDiff = coolwarm
-
-# indices into cmapModelObs for contour color
-cmapIndicesModelObs = [0, 40, 80, 110, 140, 170, 200, 230, 255]
-# indices into cmapModelObs for contour color
-cmapIndicesDiff = [0, 40, 80, 120, 140, 170, 210, 255]
-
-# colormap levels/values for contour boundaries
-clevsModelObs = [-2, 0, 2, 6, 10, 16, 22, 26, 28, 32]
-clevsDiff = [-5, -3, -2, -1, 0, 1, 2, 3, 5]
-
-# Times for comparison times (Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec, JFM, AMJ, JAS, OND, ANN)
-comparisonTimes =  ['JFM', 'JAS', 'ANN']
-
-[Test]
-
-testInt = 15
-
-testFloat = 18.0
-testFloat2 = 3.
-
-testBool = True
-
-testList = [0.5, 0.1, 0.5]
-
-testTuple = (5, 0.1, 'string')
-
-testDict = {'key1': 'string',
-            'key2': -12,
-            'key3': False}
-
-[TestNumpy]
-testNumpyarange0 = arange(0, 1, 10)
-testNumpyarange1 = np.arange(0, 1, 10)
-testNumpyarange2 = numpy.arange(0, 1, 10)
-testNumpylinspace0 = linspace(0, 1, 10)
-testNumpylinspace1 = np.linspace(0, 1, 10)
-testNumpylinspace2 = numpy.linspace(0, 1, 10)
-testNumpypi0 = pi
-testNumpypi1 = np.pi
-testNumpypi2 = numpy.pi
-testNumpyPi = Pi
-testBadStr = __bad_string__
diff --git a/mpas_analysis/test/test_mpas_xarray.py b/mpas_analysis/test/test_mpas_xarray.py
index 0b911b237..5f3716180 100644
--- a/mpas_analysis/test/test_mpas_xarray.py
+++ b/mpas_analysis/test/test_mpas_xarray.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -15,11 +15,7 @@
 02/15/2017
 """
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import numpy
-import six
 
 import pytest
 from mpas_analysis.test import TestCase, loaddatadir
@@ -57,8 +53,8 @@ def test_subset_variables(self):
                                                 variableList=variableList)
         self.assertEqual(list(ds.data_vars.keys()), variableList)
 
-        with six.assertRaisesRegex(self, ValueError,
-                                   'Empty dataset is returned.'):
+        with self.assertRaisesRegex(ValueError,
+                                    'Empty dataset is returned.'):
             missingvars = ['foo', 'bar']
             ds = mpas_xarray.open_multifile_dataset(fileNames=fileName,
                                                     calendar=calendar,
@@ -129,9 +125,9 @@ def test_bad_selvals(self):
              'refBottomDepth']
 
         selvals = {'refBottomDepth': 8.77999997138977}
-        with six.assertRaisesRegex(self, AssertionError,
-                                   'not a dimension in the dataset that '
-                                   'can be used for selection'):
+        with self.assertRaisesRegex(AssertionError,
+                                    'not a dimension in the dataset that '
+                                    'can be used for selection'):
             mpas_xarray.open_multifile_dataset(
                 fileNames=fileName,
                 calendar=calendar,
@@ -193,5 +189,3 @@ def test_remove_repeated_time_index(self):
         # There would be 3 time indices if repeat indices had not been removed.
         # Make sure there are 2.
         self.assertEqual(len(ds.Time.values), 2)
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/test/test_namelist_streams_interface.py b/mpas_analysis/test/test_namelist_streams_interface.py
index 3e4f6fedc..98af81974 100644
--- a/mpas_analysis/test/test_namelist_streams_interface.py
+++ b/mpas_analysis/test/test_namelist_streams_interface.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -16,9 +16,6 @@
 10/26/2016
 """
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import pytest
 from mpas_analysis.test import TestCase, loaddatadir
 from mpas_analysis.shared.io import NameList, StreamsFile
@@ -117,5 +114,3 @@ def test_read_streamsfile(self):
                                  calendar='gregorian_noleap')
         expectedFiles = ['{}/mesh.nc'.format(self.sf.streamsdir)]
         self.assertEqual(files, expectedFiles)
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/test/test_namelist_streams_interface/namelist.ocean b/mpas_analysis/test/test_namelist_streams_interface/namelist.ocean
index 8867cdf5c..e51e9e314 100644
--- a/mpas_analysis/test/test_namelist_streams_interface/namelist.ocean
+++ b/mpas_analysis/test/test_namelist_streams_interface/namelist.ocean
@@ -1,4 +1,4 @@
-# note, some entires are not for illustration and not used in MPAS
+# note, some entries are not for illustration and not used in MPAS
 &run_modes
     config_ocean_run_mode = 'forward'
 /
@@ -32,3 +32,4 @@
 &debug_checking_NOT_REAL
     config_test_extra_equals1 = 'a = b'
     config_test_extra_equals2 = "a = b"
+/
diff --git a/mpas_analysis/test/test_open_mpas_dataset.py b/mpas_analysis/test/test_open_mpas_dataset.py
index 3e6234039..d24293cc8 100644
--- a/mpas_analysis/test/test_open_mpas_dataset.py
+++ b/mpas_analysis/test/test_open_mpas_dataset.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -15,9 +15,6 @@
 02/16/2017
 """
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import pytest
 from mpas_analysis.test import TestCase, loaddatadir
 from mpas_analysis.shared.io import open_mpas_dataset
@@ -85,5 +82,3 @@ def test_open_process_climatology(self):
             calendar=calendar,
             timeVariableNames=['xtime_startMonthly', 'xtime_endMonthly'],
             variableList=['timeMonthly_avg_tThreshMLD'])
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/mpas_analysis/test/test_remap_obs_clim_subtask.py b/mpas_analysis/test/test_remap_obs_clim_subtask.py
index e3e182e89..5a33bd0cc 100644
--- a/mpas_analysis/test/test_remap_obs_clim_subtask.py
+++ b/mpas_analysis/test/test_remap_obs_clim_subtask.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -14,9 +14,6 @@
 Xylar Asay-Davis
 """
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import pytest
 import tempfile
 import shutil
@@ -24,24 +21,26 @@
 import xarray
 from pyremap import LatLonGridDescriptor
 
+from mpas_tools.config import MpasConfigParser
+
 from mpas_analysis.test import TestCase, loaddatadir
-from mpas_analysis.configuration import MpasAnalysisConfigParser
 from mpas_analysis.shared.climatology import RemapObservedClimatologySubtask
 from mpas_analysis.shared import AnalysisTask
 from mpas_analysis.shared.io.utility import build_config_full_path, \
     make_directories
 
 
-class RemapObservedMLDClimatology(RemapObservedClimatologySubtask):  # {{{
+class RemapObservedMLDClimatology(RemapObservedClimatologySubtask):
     """
     A subtask for reading and remapping MLD observations
     """
+
     # Authors
     # -------
     # Xylar Asay-Davis
 
-    def get_observation_descriptor(self, fileName):  # {{{
-        '''
+    def get_observation_descriptor(self, fileName):
+        """
         get a MeshDescriptor for the observation grid
 
         Parameters
@@ -53,7 +52,7 @@ def get_observation_descriptor(self, fileName):  # {{{
         -------
         obsDescriptor : ``MeshDescriptor``
             The descriptor for the observation grid
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -63,10 +62,10 @@ def get_observation_descriptor(self, fileName):  # {{{
         obsDescriptor = LatLonGridDescriptor.read(fileName=fileName,
                                                   latVarName='lat',
                                                   lonVarName='lon')
-        return obsDescriptor  # }}}
+        return obsDescriptor
 
-    def build_observational_dataset(self, fileName):  # {{{
-        '''
+    def build_observational_dataset(self, fileName):
+        """
         read in the data sets for observations, and possibly rename some
         variables and dimensions
 
@@ -79,7 +78,7 @@ def build_observational_dataset(self, fileName):  # {{{
         -------
         dsObs : ``xarray.Dataset``
             The observational dataset
-        '''
+        """
         # Authors
         # -------
         # Xylar Asay-Davis
@@ -90,9 +89,7 @@ def build_observational_dataset(self, fileName):  # {{{
         dsObs.coords['month'] = dsObs['month']
         dsObs.coords['year'] = dsObs['year']
 
-        return dsObs  # }}}
-
-    # }}}
+        return dsObs
 
 
 @pytest.mark.usefixtures("loaddatadir")
@@ -107,8 +104,8 @@ def tearDown(self):
 
     def setup_config(self):
         configPath = self.datadir.join('remap_obs.cfg')
-        config = MpasAnalysisConfigParser()
-        config.read(str(configPath))
+        config = MpasConfigParser()
+        config.add_from_file(str(configPath))
         config.set('input', 'baseDirectory', str(self.datadir))
         config.set('diagnostics', 'base_path', str(self.datadir))
         config.set('oceanObservations', 'obsSubdirectory', '.')
@@ -145,7 +142,7 @@ def test_subtask_run_analysis(self):
                     fileName = remapSubtask.get_file_name(
                         season=season, stage=stage,
                         comparisonGridName=comparisonGridName)
-                    assert(os.path.exists(fileName))
+                    assert (os.path.exists(fileName))
 
     def test_subtask_get_file_name(self):
         remapSubtask = self.setup_subtask()
@@ -153,7 +150,7 @@ def test_subtask_get_file_name(self):
         for comparisonGridName in ['latlon', 'antarctic', None]:
             fileName = remapSubtask.get_file_name(
                 stage='original', comparisonGridName=comparisonGridName)
-            assert(fileName == '{}/clim/obs/mld_4.0x4.0degree.nc'.format(
+            assert (fileName == '{}/clim/obs/mld_4.0x4.0degree.nc'.format(
                 str(self.test_dir)))
 
         stage = 'climatology'
@@ -161,17 +158,17 @@ def test_subtask_get_file_name(self):
             fileName = remapSubtask.get_file_name(stage=stage,
                                                   season='JFM',
                                                   comparisonGridName='latlon')
-            assert(fileName == '{}/clim/obs/mld_4.0x4.0degree_JFM.nc'.format(
+            assert (fileName == '{}/clim/obs/mld_4.0x4.0degree_JFM.nc'.format(
                 str(self.test_dir)))
 
         stage = 'remapped'
         fileName = remapSubtask.get_file_name(stage=stage, season='JFM',
                                               comparisonGridName='latlon')
-        assert(fileName == '{}/clim/obs/remapped/mld_4.0x4.0degree_to_'
-               '0.5x0.5degree_JFM.nc'.format(str(self.test_dir)))
+        assert (fileName == '{}/clim/obs/remapped/mld_4.0x4.0degree_to_'
+                            '0.5x0.5degree_JFM.nc'.format(str(self.test_dir)))
 
         fileName = remapSubtask.get_file_name(stage=stage, season='JFM',
                                               comparisonGridName='antarctic')
-        assert(fileName == '{}/clim/obs/remapped/mld_4.0x4.0degree_to_'
-               '6000.0x6000.0km_10.0km_Antarctic_stereo_JFM.nc'.format(
-                   str(self.test_dir)))
+        assert (fileName == f'{str(self.test_dir)}/clim/obs/remapped/'
+                            f'mld_4.0x4.0degree_to_6000.0x6000.0km_10.0km_'
+                            f'Antarctic_stereo_JFM.nc')
diff --git a/mpas_analysis/test/test_remap_obs_clim_subtask/remap_mld_obs.py b/mpas_analysis/test/test_remap_obs_clim_subtask/remap_mld_obs.py
index 02dba750a..12aee8f69 100644
--- a/mpas_analysis/test/test_remap_obs_clim_subtask/remap_mld_obs.py
+++ b/mpas_analysis/test/test_remap_obs_clim_subtask/remap_mld_obs.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
diff --git a/mpas_analysis/test/test_remap_obs_clim_subtask/remap_obs.cfg b/mpas_analysis/test/test_remap_obs_clim_subtask/remap_obs.cfg
index ab39679e5..5e76b7577 100644
--- a/mpas_analysis/test/test_remap_obs_clim_subtask/remap_obs.cfg
+++ b/mpas_analysis/test/test_remap_obs_clim_subtask/remap_obs.cfg
@@ -1,5 +1,6 @@
 [execute]
 mapParallelExec = None
+mapMpiTasks = 1
 ncremapParallelExec = None
 
 [diagnostics]
diff --git a/mpas_analysis/test/test_timekeeping.py b/mpas_analysis/test/test_timekeeping.py
index 151173fab..00abfd1d9 100644
--- a/mpas_analysis/test/test_timekeeping.py
+++ b/mpas_analysis/test/test_timekeeping.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
@@ -15,12 +15,8 @@
 # -------
 # Xylar Asay-Davis
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
 import pytest
 import datetime
-import six
 from mpas_analysis.shared.timekeeping.MpasRelativeDelta \
     import MpasRelativeDelta
 from mpas_analysis.test import TestCase
@@ -205,9 +201,9 @@ def test_MpasRelativeDeltaOps(self):
 
         # make sure there's an error when we try to add MpasRelativeDeltas
         # with different calendars
-        with six.assertRaisesRegex(self, ValueError,
-                                   'MpasRelativeDelta objects can only be '
-                                   'added if their calendars match.'):
+        with self.assertRaisesRegex(ValueError,
+                                    'MpasRelativeDelta objects can only be '
+                                    'added if their calendars match.'):
             delta1 = string_to_relative_delta('0000-01-00',
                                               calendar='gregorian')
             delta2 = string_to_relative_delta('0000-00-01',
@@ -297,5 +293,3 @@ def test_date_to_days(self):
                                 calendar=calendar,
                                 referenceDate=referenceDate)
             self.assertApproxEqual(days, expected_days)
-
-# vim: foldmethod=marker ai ts=4 sts=4 et sw=4 ft=python
diff --git a/preprocess_observations/preprocess_SOSE_data.py b/preprocess_observations/preprocess_SOSE_data.py
index 8eceb0611..a2acfa946 100755
--- a/preprocess_observations/preprocess_SOSE_data.py
+++ b/preprocess_observations/preprocess_SOSE_data.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
diff --git a/preprocess_observations/preprocess_Schmidtko_data.py b/preprocess_observations/preprocess_Schmidtko_data.py
index 1043eac06..ad07760d8 100755
--- a/preprocess_observations/preprocess_Schmidtko_data.py
+++ b/preprocess_observations/preprocess_Schmidtko_data.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
diff --git a/preprocess_observations/remap_rignot.py b/preprocess_observations/remap_rignot.py
index 1d57acf47..fa71a27b4 100644
--- a/preprocess_observations/remap_rignot.py
+++ b/preprocess_observations/remap_rignot.py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
diff --git a/setup.py b/setup.py
index e0069c833..7e2783711 100755
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
diff --git a/suite/job_script.bash b/suite/job_script.bash
index 1cc41693d..1eca4296c 100644
--- a/suite/job_script.bash
+++ b/suite/job_script.bash
@@ -8,14 +8,21 @@
 
 set -e
 
+{% if use_e3sm_unified %}
+source {{ e3sm_unified_script }}
+
+echo E3SM-Unified: {{ e3sm_unified_script }}
+{% else %}
 source {{ conda_base }}/etc/profile.d/conda.sh
 conda activate {{ conda_env }}
 export HDF5_USE_FILE_LOCKING=FALSE
 export E3SMU_MACHINE={{ machine }}
 
 echo env: {{ conda_env }}
+{% endif %}
 echo configs: {{ flags }} {{ config }}
 
+
 {{ parallel_exec }} mpas_analysis --list
 {{ parallel_exec }} mpas_analysis --plot_colormaps
 {{ parallel_exec }} mpas_analysis --setup_only {{ flags }} {{ config }}
diff --git a/suite/run_e3sm_unified_suite.bash b/suite/run_e3sm_unified_suite.bash
new file mode 100755
index 000000000..5bab0741a
--- /dev/null
+++ b/suite/run_e3sm_unified_suite.bash
@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+set -e
+
+# placeholder that gets replaced
+branch=test_e3sm_unified
+
+# test building the docs
+py=3.9
+machine=${E3SMU_MACHINE}
+
+./suite/setup.py -p ${py} -r main_py${py} -b ${branch} --clean
+./suite/setup.py -p ${py} -r wc_defaults -b ${branch} --no_polar_regions
+./suite/setup.py -p ${py} -r no_ncclimo -b ${branch}
+./suite/setup.py -p ${py} -r ctrl -b ${branch}
+./suite/setup.py -p ${py} -r main_vs_ctrl -b ${branch}
+./suite/setup.py -p ${py} -r no_polar_regions -b ${branch} --no_polar_regions
+./suite/setup.py -p ${py} -r mesh_rename -b ${branch}
+
+# submit the jobs
+cd ${machine}_test_suite
+
+cd main_py${py}
+echo main_py${py}
+RES=$(sbatch job_script.bash)
+cd ..
+
+cd main_vs_ctrl
+echo main_vs_ctrl
+sbatch --dependency=afterok:${RES##* } job_script.bash --kill-on-invalid-dep=yes
+cd ..
+
+for run in wc_defaults no_ncclimo no_polar_regions mesh_rename
+do
+    cd ${run}
+    echo ${run}
+    sbatch job_script.bash
+    cd ..
+done
+
+cd ..
+
+# only LCRC machines have a separate QU480 run
+if [[ "$machine" == "anvil" || "$machine" == "chrysalis" ]]
+then
+  ./suite/setup.py -p ${py} -r QU480 -b ${branch}
+  cd ${machine}_test_suite/QU480
+  echo QU480
+  sbatch job_script.bash
+  cd ../..
+fi
diff --git a/suite/run_suite.bash b/suite/run_suite.bash
index 67836c504..059324343 100755
--- a/suite/run_suite.bash
+++ b/suite/run_suite.bash
@@ -72,7 +72,7 @@ cd ..
 
 cd main_vs_ctrl
 echo main_vs_ctrl
-sbatch --dependency=afterok:${RES##* } job_script.bash
+sbatch --dependency=afterok:${RES##* } job_script.bash --kill-on-invalid-dep=yes
 cd ..
 
 for run in main_py${alt_py} wc_defaults no_ncclimo no_polar_regions \
diff --git a/suite/setup.py b/suite/setup.py
index 903d2f63c..e13abf78b 100755
--- a/suite/setup.py
+++ b/suite/setup.py
@@ -34,6 +34,14 @@ def main():
     account, partition, configuration, qos = \
         machine_info.get_account_defaults()
 
+    use_e3sm_unified = 'E3SMU_SCRIPT' in os.environ
+    if use_e3sm_unified:
+        e3sm_unified_script = os.environ['E3SMU_SCRIPT']
+        args.branch = \
+            os.path.splitext(os.path.basename(e3sm_unified_script))[0]
+    else:
+        e3sm_unified_script = None
+
     if machine == 'chrysalis':
         # we don't want the default, which is 'debug'
         partition = 'compute'
@@ -132,27 +140,14 @@ def main():
         out_subdir = os.path.join(machine, args.branch, args.run)
     out_common_dir = os.path.join(machine, args.branch)
 
-    if machine == 'cori-haswell':
-        execute_options = \
-            '# the number of MPI tasks to use in creating mapping files (1 means tasks run in\n' \
-            '# serial, the default)\n' \
-            'mapMpiTasks = 1\n' \
-            '\n' \
-            '# "None" if ESMF should perform mapping file generation in serial without a\n' \
-            '# command, or one of "srun" or "mpirun" if it should be run in parallel (or ins\n' \
-            '# serial but with a command)\n' \
-            'mapParallelExec = None'
-    else:
-        execute_options = ''
-
     with open(os.path.join('suite', 'template.cfg')) as template_file:
         template_data = template_file.read()
     template = Template(template_data)
     config_text = template.render(
-        run_name=args.run, input_base=input_base, simulation=simulation,
-        mesh=mesh, output_base=output_base, html_base=html_base,
-        out_subdir=out_subdir, generate=generate, end_year=end_year,
-        execute_options=execute_options)
+        use_e3sm_unified=use_e3sm_unified, run_name=args.run,
+        input_base=input_base, simulation=simulation, mesh=mesh,
+        output_base=output_base, html_base=html_base, out_subdir=out_subdir,
+        generate=generate, end_year=end_year)
     with open(config, 'w') as config_file:
         config_file.write(config_text)
 
@@ -183,7 +178,9 @@ def main():
             template_data = template_file.read()
         template = Template(template_data)
         job_text = template.render(
-            sbatch=sbatch, conda_base=conda_base, conda_env=conda_env,
+            sbatch=sbatch, conda_base=conda_base,
+            use_e3sm_unified=use_e3sm_unified,
+            e3sm_unified_script=e3sm_unified_script, conda_env=conda_env,
             machine=machine, flags=flags, config=config_from_job,
             parallel_exec=parallel_exec, html_base=html_base,
             out_subdir=out_subdir, out_common_dir=out_common_dir)
diff --git a/suite/template.cfg b/suite/template.cfg
index 5b13144a5..2d41d559f 100644
--- a/suite/template.cfg
+++ b/suite/template.cfg
@@ -19,10 +19,19 @@ mainRunName = {{ run_name }}
 # performed.
 # mainRunConfigFile = /path/to/config/file
 
+{% if not use_e3sm_unified %}
 [execute]
 ## options related to executing parallel tasks
 
-{{ execute_options }}
+# the number of MPI tasks to use in creating mapping files (1 means tasks run in
+# serial, the default)
+mapMpiTasks = 1
+
+# "None" if ESMF should perform mapping file generation in serial without a
+# command, or one of "srun" or "mpirun" if it should be run in parallel (or in
+# serial but with a command)
+mapParallelExec = None
+{% endif %}
 
 [input]
 ## options related to reading in the results to be analyzed
diff --git a/utility_scripts/make_ismip6_region_masks.py b/utility_scripts/make_ismip6_region_masks.py
index 497c9365f..1b30f6b53 100755
--- a/utility_scripts/make_ismip6_region_masks.py
+++ b/utility_scripts/make_ismip6_region_masks.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at
diff --git a/utility_scripts/make_region_mask.py b/utility_scripts/make_region_mask.py
index 3202e69df..60dc64849 100755
--- a/utility_scripts/make_region_mask.py
+++ b/utility_scripts/make_region_mask.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at