diff --git a/atst/app.py b/atst/app.py
index bdaadcb7..2c2b0cba 100644
--- a/atst/app.py
+++ b/atst/app.py
@@ -16,7 +16,7 @@ from atst.routes.workspaces import bp as workspace_routes
 from atst.routes.requests import requests_bp
 from atst.routes.dev import bp as dev_routes
 from atst.routes.errors import make_error_pages
-from atst.domain.authnid.crl.validator import Validator
+from atst.domain.authnid.crl import Validator
 from atst.domain.auth import apply_authentication
 
 
diff --git a/atst/domain/authnid/crl/validator.py b/atst/domain/authnid/crl/__init__.py
similarity index 100%
rename from atst/domain/authnid/crl/validator.py
rename to atst/domain/authnid/crl/__init__.py
diff --git a/atst/domain/authnid/crl/util.py b/atst/domain/authnid/crl/util.py
index 13e8106d..7e9948e1 100644
--- a/atst/domain/authnid/crl/util.py
+++ b/atst/domain/authnid/crl/util.py
@@ -56,7 +56,6 @@ def refresh_crls(out_dir, logger=None):
 
 if __name__ == "__main__":
     import sys
-    import datetime
     import logging
 
     logging.basicConfig(
diff --git a/atst/routes/requests/jedi_request_flow.py b/atst/routes/requests/jedi_request_flow.py
index 02e10e2b..34f3508f 100644
--- a/atst/routes/requests/jedi_request_flow.py
+++ b/atst/routes/requests/jedi_request_flow.py
@@ -61,7 +61,8 @@ class JEDIRequestFlow(object):
         return self.current_screen["form"]
 
     # maps user data to fields in OrgForm; this should be moved into the
-    # request initialization process when we have a request schema
+    # request initialization process when we have a request schema, or we just
+    # shouldn't record this data on the request
     def map_current_user(self):
         if self.request:
             return {
diff --git a/tests/domain/authnid/test_crl.py b/tests/domain/authnid/test_crl.py
index 6bfdd99e..5593a865 100644
--- a/tests/domain/authnid/test_crl.py
+++ b/tests/domain/authnid/test_crl.py
@@ -4,7 +4,7 @@ import re
 import os
 import shutil
 from OpenSSL import crypto, SSL
-from atst.domain.authnid.crl.validator import Validator
+from atst.domain.authnid.crl import Validator
 import atst.domain.authnid.crl.util as util