diff --git a/account_manager.py b/account_manager.py
index 109a516bb9b875a18046a377d674c913975a61bd..1604784968e2fc589bbc0693a51f907e8bef5743 100755
--- a/account_manager.py
+++ b/account_manager.py
@@ -1,14 +1,15 @@
#!/usr/bin/env python3
-import json
-import rc_util
import argparse
+import json
import signal
+import time
import uuid
+
import pika
+
+import rabbit_config as rcfg
import rc_util
from rc_rmq import RCRMQ
-import rabbit_config as rcfg
-import time
parser = argparse.ArgumentParser(description = "Account management driver script")
parser.add_argument(
diff --git a/agent_template.py b/agent_template.py
index 7858bdbfc144b7d2e858fb8fb525e5b4609659bd..16176c42e9f14ce9af99c5567989a9e225680a45 100644
--- a/agent_template.py
+++ b/agent_template.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import json
+
from rc_rmq import RCRMQ
task = "task_name"
diff --git a/create_account.py b/create_account.py
index 42668c36a52677d9998601266ed999bd08ba6d77..a3299770d908ff1854e117c26f3208405f28854a 100755
--- a/create_account.py
+++ b/create_account.py
@@ -1,9 +1,10 @@
#!/usr/bin/env python3
-import json
-import rc_util
import argparse
+import json
import signal
+import rc_util
+
parser = argparse.ArgumentParser()
parser.add_argument("username", help="username that will be created")
parser.add_argument("email", nargs="?", default="", help="User's email")
diff --git a/dev_rmq_agents/ohpc_account_create.py b/dev_rmq_agents/ohpc_account_create.py
index 5cdabd5e6f0d0905a42abf85f1f92d10835cd145..fa83fe63d9f1029c5a239a241d93bf99c72b9780 100644
--- a/dev_rmq_agents/ohpc_account_create.py
+++ b/dev_rmq_agents/ohpc_account_create.py
@@ -1,8 +1,9 @@
#!/usr/bin/env python
-import sys
import json
import subprocess
+import sys
from pwd import getpwnam
+
from rc_rmq import RCRMQ
task = "ohpc_account"
diff --git a/dev_rmq_agents/ood_account_create.py b/dev_rmq_agents/ood_account_create.py
index de4ed8a8d73d2af39e9fb86c29a0fb17bf83b67f..57e7a9b8119a8df0b2ecebdccb7c03ca94be20f2 100644
--- a/dev_rmq_agents/ood_account_create.py
+++ b/dev_rmq_agents/ood_account_create.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
-import sys
import json
import subprocess
+import sys
+
from rc_rmq import RCRMQ
task = "ood_account"
diff --git a/dev_rmq_agents/slurm_agent.py b/dev_rmq_agents/slurm_agent.py
index f6c4350c6cad79e010a6a7c576260db201a19bd3..c40dac164d7ba985db40eab2a747ce1ec21e852c 100755
--- a/dev_rmq_agents/slurm_agent.py
+++ b/dev_rmq_agents/slurm_agent.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
-import sys
import json
import subprocess
+import sys
+
from rc_rmq import RCRMQ
task = "slurm_account"
diff --git a/flask_producer.py b/flask_producer.py
index 908b57f9d9e5c6f752421dc76dc2fd472a4e2259..8cea3af6c97dcba1ff4450e5ff816872cf9fdc67 100755
--- a/flask_producer.py
+++ b/flask_producer.py
@@ -1,8 +1,10 @@
#!/usr/bin/env python
-import pika
-import sys
-import socket
import json
+import socket
+import sys
+
+import pika
+
import rabbit_config as rcfg
if len(sys.argv) < 3:
diff --git a/init_user_state.py b/init_user_state.py
index 54ba947560e151fa12592d7f314bb5b916a1ccb4..f539d2cd3805d3a9532d84840784c83d44d73a50 100644
--- a/init_user_state.py
+++ b/init_user_state.py
@@ -1,11 +1,13 @@
#!/usr/bin/env python3
import argparse
-import dataset
-import sys
import subprocess
+import sys
+from datetime import datetime
+
+import dataset
+
import rabbit_config as rcfg
import rc_util
-from datetime import datetime
parser = argparse.ArgumentParser()
parser.add_argument("-f", "--force", action="store_true", help="force update")
diff --git a/prod_rmq_agents/acct_mgmt_workflow.py b/prod_rmq_agents/acct_mgmt_workflow.py
index 124af99d6178dc2fddd34084c0fe22aa4282e05e..79a60f937d77b43d2afc036f6bb47e33287503a2 100755
--- a/prod_rmq_agents/acct_mgmt_workflow.py
+++ b/prod_rmq_agents/acct_mgmt_workflow.py
@@ -1,14 +1,15 @@
#!/usr/bin/env python3
-import json
-import rc_util
import argparse
+import json
import signal
+import time
import uuid
+
import pika
+
+import rabbit_config as rcfg
import rc_util
from rc_rmq import RCRMQ
-import rabbit_config as rcfg
-import time
task = "acctmgr"
diff --git a/prod_rmq_agents/dir_verify.py b/prod_rmq_agents/dir_verify.py
index 4b768c9428a4f1438eeb2b81d3f84d6d9c5c1ebc..7493ed7532ce51cdb484e77c247f0988c61fb2d1 100644
--- a/prod_rmq_agents/dir_verify.py
+++ b/prod_rmq_agents/dir_verify.py
@@ -1,10 +1,11 @@
#!/usr/bin/env python
-import os
import json
-import rc_util
+import os
from pathlib import Path
-from rc_rmq import RCRMQ
+
import rabbit_config as rcfg
+import rc_util
+from rc_rmq import RCRMQ
task = "dir_verify"
dirs = rcfg.User_dirs
diff --git a/prod_rmq_agents/expire_account.py b/prod_rmq_agents/expire_account.py
index 94e421276fdb68e2bc07800d75beb0f696fb64c3..b8de124510c0c9bf6cdd986180803bfffb5301d7 100644
--- a/prod_rmq_agents/expire_account.py
+++ b/prod_rmq_agents/expire_account.py
@@ -1,13 +1,15 @@
#!/usr/bin/env python
-import os
import json
-import pika
-import rc_util
+import os
+from datetime import date, timedelta
from os import popen
from pathlib import Path
-from rc_rmq import RCRMQ
+
+import pika
+
import rabbit_config as rcfg
-from datetime import date, timedelta
+import rc_util
+from rc_rmq import RCRMQ
task = "expire_account"
diff --git a/prod_rmq_agents/get-next-uid-gid.py b/prod_rmq_agents/get-next-uid-gid.py
index 03cb51f783a789610698ed1ba53700c637177439..fdad2e39dc7cd024db8cd523f79aff95ba5873d3 100644
--- a/prod_rmq_agents/get-next-uid-gid.py
+++ b/prod_rmq_agents/get-next-uid-gid.py
@@ -1,12 +1,13 @@
#!/usr/bin/env python
import json
+import shlex
import time
-import rc_util
from os import popen
-from rc_rmq import RCRMQ
-import rabbit_config as rcfg
from subprocess import run
-import shlex
+
+import rabbit_config as rcfg
+import rc_util
+from rc_rmq import RCRMQ
task = "create_account"
diff --git a/prod_rmq_agents/git_commit.py b/prod_rmq_agents/git_commit.py
index c8665c17d3a596fa80923cf64b3b333e490a8034..5e1f40f9d2f581426d7eb62c2238c1f1f504f65d 100644
--- a/prod_rmq_agents/git_commit.py
+++ b/prod_rmq_agents/git_commit.py
@@ -1,11 +1,13 @@
#!/usr/bin/env python
+import json
import os
+import time
+
import sh
-import json
+
+import rabbit_config as rmq_cfg
import rc_util
from rc_rmq import RCRMQ
-import rabbit_config as rmq_cfg
-import time
task = "git_commit"
diff --git a/prod_rmq_agents/new_jobs.py b/prod_rmq_agents/new_jobs.py
index 2d3280defec66f67f9c45a8e25412327a2f14df8..f8d9abecd632176049631ea8360307af3c0ef501 100644
--- a/prod_rmq_agents/new_jobs.py
+++ b/prod_rmq_agents/new_jobs.py
@@ -1,12 +1,14 @@
#!/usr/bin/env python
-import os
import json
-import pika
-import rc_util
+import os
from os import popen
from pathlib import Path
-from rc_rmq import RCRMQ
+
+import pika
+
import rabbit_config as rcfg
+import rc_util
+from rc_rmq import RCRMQ
task = "new_jobs"
diff --git a/prod_rmq_agents/notify_user.py b/prod_rmq_agents/notify_user.py
index d204bad3d1e0e2b73862f98683672a0aef41f6a3..802807aba12bed74a8f53f0b1a85f9e5177a0269 100644
--- a/prod_rmq_agents/notify_user.py
+++ b/prod_rmq_agents/notify_user.py
@@ -1,13 +1,15 @@
#!/usr/bin/env python
import json
-import rc_util
import smtplib
+from datetime import datetime
+
import dataset
-from rc_rmq import RCRMQ
+import mail_config as mail_cfg
from jinja2 import Template
-from datetime import datetime
+
import rabbit_config as rcfg
-import mail_config as mail_cfg
+import rc_util
+from rc_rmq import RCRMQ
task = "notify_user"
diff --git a/prod_rmq_agents/ssh_access.py b/prod_rmq_agents/ssh_access.py
index e289e579ab618a8ccc3f66ad070db22c1016f48f..fea6eacdfbfaec05404cfe8fc7da4294bdcc3a86 100644
--- a/prod_rmq_agents/ssh_access.py
+++ b/prod_rmq_agents/ssh_access.py
@@ -1,12 +1,14 @@
#!/usr/bin/env python
-import os
import json
-import pika
-import rc_util
+import os
from os import popen
from pathlib import Path
-from rc_rmq import RCRMQ
+
+import pika
+
import rabbit_config as rcfg
+import rc_util
+from rc_rmq import RCRMQ
task = "ssh_access"
diff --git a/prod_rmq_agents/subscribe_mail_lists.py b/prod_rmq_agents/subscribe_mail_lists.py
index a70d007e54721979bd82ef03b4216710a9c74303..4629b104af9ae73ae2ce6a05319d9b5eb5e7b742 100644
--- a/prod_rmq_agents/subscribe_mail_lists.py
+++ b/prod_rmq_agents/subscribe_mail_lists.py
@@ -1,10 +1,11 @@
#!/usr/bin/env python
import json
import smtplib
-import rc_util
from email.message import EmailMessage
-from rc_rmq import RCRMQ
+
import rabbit_config as rcfg
+import rc_util
+from rc_rmq import RCRMQ
task = "subscribe_mail_list"
diff --git a/prod_rmq_agents/task_manager.py b/prod_rmq_agents/task_manager.py
index 3b82f838f47ed8b926bb3ecc3b506ea59bb26fdf..df04f40ed6701ff6269ea0031fdad28c222b435d 100644
--- a/prod_rmq_agents/task_manager.py
+++ b/prod_rmq_agents/task_manager.py
@@ -2,14 +2,16 @@
import copy
import json
import signal
-import dataset
-import rc_util
import smtplib
-from rc_rmq import RCRMQ
-from jinja2 import Template
from datetime import datetime
+
+import dataset
import mail_config as mail_cfg
+from jinja2 import Template
+
import rabbit_config as rcfg
+import rc_util
+from rc_rmq import RCRMQ
task = "task_manager"
timeout = 30
diff --git a/prod_rmq_agents/user_reg_event_logger.py b/prod_rmq_agents/user_reg_event_logger.py
index 177b2c97ff543e0f05936991a1512fa6a975cfdf..606b24ffa3b899b7633a2e1e083911be6174a735 100644
--- a/prod_rmq_agents/user_reg_event_logger.py
+++ b/prod_rmq_agents/user_reg_event_logger.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import json
+
from rc_rmq import RCRMQ
task = "user_reg_event_log"
diff --git a/prod_rmq_agents/user_reg_logger.py b/prod_rmq_agents/user_reg_logger.py
index ea8f9eed894c93c304f7c755c3f74f69b72f7029..568bee1f2f67da5f6e867817ef734d22e8f4c633 100755
--- a/prod_rmq_agents/user_reg_logger.py
+++ b/prod_rmq_agents/user_reg_logger.py
@@ -1,10 +1,12 @@
#!/usr/bin/env python
import json
+from datetime import datetime
+
import dataset
+
+import rabbit_config as rcfg
import rc_util
from rc_rmq import RCRMQ
-from datetime import datetime
-import rabbit_config as rcfg
# Define queue name
task = "reg_logger"
diff --git a/prod_rmq_agents/user_state.py b/prod_rmq_agents/user_state.py
index 208af16b4b68886161c79683f92ad77ab01df8e3..8a05f45a3abe80a617203758a0087e89b24e31f7 100644
--- a/prod_rmq_agents/user_state.py
+++ b/prod_rmq_agents/user_state.py
@@ -1,11 +1,13 @@
#!/usr/bin/env python
import json
-import rc_util
+from datetime import datetime
+
import dataset
import pika
-from rc_rmq import RCRMQ
-from datetime import datetime
+
import rabbit_config as rcfg
+import rc_util
+from rc_rmq import RCRMQ
task = "user_state"
diff --git a/rc_rmq.py b/rc_rmq.py
index 8227982803d0033dc6855fd2de8685fd65dfefbe..47896f18e23dc58cccd4ea3ad88f1a93b6e090ac 100644
--- a/rc_rmq.py
+++ b/rc_rmq.py
@@ -1,6 +1,8 @@
import json
-import pika
import socket
+
+import pika
+
import rabbit_config as rcfg
diff --git a/rc_util.py b/rc_util.py
index 89f84e9169ad95fee359906673b6c473cd4c894f..3fffb1b337196037466bfeb1b78cd50ec9a6e0ee 100644
--- a/rc_util.py
+++ b/rc_util.py
@@ -1,17 +1,19 @@
+import argparse
import errno
import functools
-import os
-import signal
+import json
import logging
-import argparse
-import pika
+import os
import pwd
+import signal
import uuid
-from rc_rmq import RCRMQ
-import json
-from urllib.parse import quote
from time import sleep
+from urllib.parse import quote
+
+import pika
+
import rabbit_config as rcfg
+from rc_rmq import RCRMQ
rc_rmq = RCRMQ({"exchange": "RegUsr", "exchange_type": "topic"})
tasks = {
diff --git a/user_auth.py b/user_auth.py
index 54b8f8ad93acf25980b393377e7b7c6806ad7a3c..2ec2c7cef2c5fe7a4eff2261266a58f1c4586dc6 100644
--- a/user_auth.py
+++ b/user_auth.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python3
+import subprocess
import sys
+
import rc_util
-import subprocess
# During migration of this new script for ood
# e.g. not all of users are in the db