@@ -6,7 +6,7 @@
 from paths_cli.tests.wizard.mock_wizard import mock_wizard
 
 from paths_cli.wizard.load_from_ops import (
-    named_objs_helper, _get_ops_storage, _get_ops_object, load_from_ops
+    _get_ops_storage, _get_ops_object, load_from_ops
 )
 
 # for some reason I couldn't get these to work with MagicMock
@@ -44,12 +44,6 @@ def ops_file_fixture():
     storage = FakeStorage(foo)
     return storage
 
-def test_named_objs_helper(ops_file_fixture):
-    helper_func = named_objs_helper(ops_file_fixture, 'foo')
-    result = helper_func('any')
-    assert "what I found" in result
-    assert "bar" in result
-    assert "baz" in result
 
 @pytest.mark.parametrize('with_failure', [False, True])
 def test_get_ops_storage(tmpdir, with_failure):
 
@@ -1,23 +1,42 @@
 class ImpossibleError(Exception):
+    """Error to throw for sections that should be unreachable code"""
     def __init__(self, msg=None):
         if msg is None:
             msg = "Something went really wrong. You should never see this."
         super().__init__(msg)
 
+
 class RestartObjectException(BaseException):
+    """Exception to indicate the restart of an object.
+
+    Raised when the user issues a command to cause an object restart.
+    """
     pass
 
+
 def not_installed(wizard, package, obj_type):
+    """Behavior when an integration is not installed.
+
+    In actual practice, this calling code should ensure this doesn't get
+    used. However, we keep it around as a defensive practice.
+
+    Parameters
+    ----------
+    package : str
+        name of the missing package
+    obj_type : str
+        name of the object category that would have been created
+    """
     retry = wizard.ask(f"Hey, it looks like you don't have {package} "
                        "installed. Do you want to try a different "
                        f"{obj_type}, or do you want to quit?",
                        options=["[R]etry", "[Q]uit"])
     if retry == 'r':
         raise RestartObjectException()
-    elif retry == 'q':
+    if retry == 'q':
+        # TODO: maybe raise QuitWizard instead?
         exit()
-    else:  # no-cov
-        raise ImpossibleError()
+    raise ImpossibleError()
 
 
 FILE_LOADING_ERROR_MSG = ("Sorry, something went wrong when loading that "
 
@@ -1,24 +1,31 @@
+import sys
 from .errors import RestartObjectException
 
 
 class QuitWizard(BaseException):
-    pass
+    """Exception raised when user expresses desire to quit the wizard"""
 
 
 # the following command functions take cmd and ctx -- future commands might
 # use the full command text or the context internally.
 
 def raise_quit(cmd, ctx):
+    """Command function to quit the wizard (with option to save).
+    """
     raise QuitWizard()
 
 
 def raise_restart(cmd, ctx):
+    """Command function to restart the current object.
+    """
     raise RestartObjectException()
 
 
 def force_exit(cmd, ctx):
+    """Command function to force immediate exit.
+    """
     print("Exiting...")
-    exit()
+    sys.exit()
 
 
 HELPER_COMMANDS = {
 
@@ -16,31 +16,38 @@
     "It would also be a good name for a death metal band.",
 ]
 
+
 def _joke1(name, obj_type):  # no-cov
     return (f"I probably would have named it something like "
             f"'{random.choice(_NAMES)}'.")
 
+
 def _joke2(name, obj_type):  # no-cov
     thing = random.choice(_THINGS)
     joke = (f"I had {a_an(thing)} {thing} named '{name}' "
             f"when I was young.")
     return joke
 
+
 def _joke3(name, obj_type):  # no-cov
     return (f"I wanted to name my {random.choice(_SPAWN)} '{name}', but my "
             f"wife wouldn't let me.")
 
+
 def _joke4(name, obj_type):  # no-cov
     a_an_thing = a_an(obj_type) + f" {obj_type}"
     return random.choice(_MISC).format(name=name, obj_type=obj_type,
                                        a_an_thing=a_an_thing)
 
+
 def name_joke(name, obj_type):  # no-cov
+    """Make a joke about the naming process."""
     jokes = [_joke1, _joke2, _joke3, _joke4]
     weights = [5, 5, 3, 7]
     joke = random.choices(jokes, weights=weights)[0]
     return joke(name, obj_type)
 
+
 if __name__ == "__main__":  # no-cov
     for _ in range(5):
         print()
 
@@ -5,16 +5,6 @@
 LABEL = "Load existing from OPS file"
 
 
-def named_objs_helper(storage, store_name):
-    def list_items(user_input, context=None):
-        store = getattr(storage, store_name)
-        names = [obj for obj in store if obj.is_named]
-        outstr = "\n".join(['* ' + obj.name for obj in names])
-        return f"Here's what I found:\n\n{outstr}"
-
-    return list_items
-
-
 @get_object
 def _get_ops_storage(wizard):
     filename = wizard.ask("What file can it be found in?",
@@ -40,6 +30,24 @@ def _get_ops_object(wizard, storage, store_name, obj_name):
 
 
 def load_from_ops(wizard, store_name, obj_name):
+    """Load an object from an OPS file
+
+    Parameters
+    ----------
+    wizard : :class:`.Wizard`
+        the wizard for user interaction
+    store_name : str
+        name of the store where this object will be found
+    obj_name : str
+        name of the object to load
+
+    Returns
+    -------
+    Any :
+        the object loaded from the file
+    """
+    # TODO: this might be replaced by something in compiling to load from
+    # files
     wizard.say("Okay, we'll load it from an OPS file.")
     storage = _get_ops_storage(wizard)
     obj = _get_ops_object(wizard, storage, store_name, obj_name)
 
@@ -1,21 +1,17 @@
-from paths_cli.wizard.errors import FILE_LOADING_ERROR_MSG, not_installed
-from paths_cli.wizard.core import get_object
-
-# should be able to simplify this try block when we drop OpenMM < 7.6
-from paths_cli.compat.openmm import mm, HAS_OPENMM
-
-OPENMM_SERIALIZATION_URL=(
-    "http://docs.openmm.org/latest/api-python/generated/"
-    "openmm.openmm.XmlSerializer.html"
-)
+from paths_cli.compat.openmm import HAS_OPENMM
 
 from paths_cli.wizard.parameters import ProxyParameter
 from paths_cli.wizard.plugin_classes import WizardParameterObjectPlugin
 
 from paths_cli.compiling.engines import OPENMM_PLUGIN as OPENMM_COMPILING
 
-_where_is_xml = "Where is the XML file for your OpenMM {obj_type}?"
-_xml_help = (
+OPENMM_SERIALIZATION_URL = (
+    "http://docs.openmm.org/latest/api-python/generated/"
+    "openmm.openmm.XmlSerializer.html"
+)
+
+_WHERE_IS_XML = "Where is the XML file for your OpenMM {obj_type}?"
+_XML_HELP = (
     "You can write OpenMM objects like systems and integrators to XML "
     "files using the XMLSerializer class. Learn more here:\n"
     + OPENMM_SERIALIZATION_URL
@@ -43,13 +39,13 @@
             ),
             ProxyParameter(
                 name='integrator',
-                ask=_where_is_xml.format(obj_type='integrator'),
-                helper=_xml_help,
+                ask=_WHERE_IS_XML.format(obj_type='integrator'),
+                helper=_XML_HELP,
             ),
             ProxyParameter(
                 name='system',
-                ask=_where_is_xml.format(obj_type="system"),
-                helper=_xml_help,
+                ask=_WHERE_IS_XML.format(obj_type="system"),
+                helper=_XML_HELP,
             ),
             ProxyParameter(
                 name='n_steps_per_frame',
 
@@ -1,8 +1,5 @@
-from paths_cli.compiling.tools import custom_eval
-import importlib
 from collections import namedtuple
 
-from paths_cli.wizard.helper import Helper
 from paths_cli.compiling.root_compiler import _CategoryCompilerProxy
 from paths_cli.wizard.standard_categories import get_category_info
 
@@ -16,6 +13,7 @@
     defaults=[None, NO_DEFAULT, False, None]
 )
 
+
 class WizardParameter:
     """Load a single parameter from the wizard.
 
@@ -47,7 +45,7 @@ def __init__(self, name, ask, loader, *, helper=None, default=NO_DEFAULT,
         self.default = default
         self.autohelp = autohelp
         if summarize is None:
-            summarize = lambda obj: str(obj)
+            summarize = str
         self.summarize = summarize
 
     @classmethod
@@ -66,15 +64,17 @@ def from_proxy(cls, proxy, compiler_plugin):
         loader = loader_dict[proxy.name]
         if isinstance(loader, _CategoryCompilerProxy):
             # TODO: can this import now be moved to top of file?
-            from paths_cli.wizard.plugin_registration import get_category_wizard
+            from paths_cli.wizard.plugin_registration import \
+                    get_category_wizard
             category = loader.category
             dct['loader'] = get_category_wizard(category)
             dct['ask'] = get_category_info(category).singular
             dct['store_name'] = get_category_info(category).storage
-            cls = _ExistingObjectParameter
+            cls_ = _ExistingObjectParameter
         else:
+            cls_ = cls
             dct['loader'] = loader
-        return cls(**dct)
+        return cls_(**dct)
 
     def __call__(self, wizard, context):
         """Load the parameter.
@@ -268,7 +268,8 @@ def __call__(self, wizard, context=None):
         if n_existing == self.n_required:
             # early return in this case (return silently)
             return {self.name: self._get_existing(wizard)}
-        elif n_existing > self.n_required:
+
+        if n_existing > self.n_required:
             sel = [self._select_single_existing(wizard)
                    for _ in range(self.n_required)]
             dct = {self.name: sel}