diff --git a/Makefile b/Makefile
index ed14c11..7fdeb11 100644
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,15 @@ lint-fix:
 	@ruff check . --fix
 .PHONY: lint-fix
 
+AUTOPEP8_EXCLUDES=optimism,op-geth,venv,account-abstraction
+AUTOPEP8_OPTIONS=--recursive . --exclude $(AUTOPEP8_EXCLUDES) --max-line-length 100
+
 format-check:
-	@autopep8 --diff --recursive . --exclude optimism,op-geth,venv --max-line-length 100 --exit-code
+	@autopep8 --diff --exit-code $(AUTOPEP8_OPTIONS)
 .PHONY: format-check
 
 format:
-	@autopep8 --in-place --recursive . --exclude optimism,op-geth,venv --max-line-length 100
+	@autopep8 --in-place $(AUTOPEP8_OPTIONS)
 .PHONY: format
 
 check: lint format-check
diff --git a/l1.py b/l1.py
index 5fa970e..897ba72 100644
--- a/l1.py
+++ b/l1.py
@@ -6,7 +6,6 @@
 import os
 import pathlib
 import shutil
-import subprocess
 import sys
 
 import libroll as lib
diff --git a/l2_batcher.py b/l2_batcher.py
index 638bbdd..d17e1fe 100644
--- a/l2_batcher.py
+++ b/l2_batcher.py
@@ -1,4 +1,3 @@
-import subprocess
 import sys
 
 from config import Config
diff --git a/l2_engine.py b/l2_engine.py
index 5ecbc39..452fc23 100644
--- a/l2_engine.py
+++ b/l2_engine.py
@@ -1,6 +1,5 @@
 import os
 import shutil
-import subprocess
 import sys
 
 from config import Config
diff --git a/l2_node.py b/l2_node.py
index cc25f47..c9b7227 100644
--- a/l2_node.py
+++ b/l2_node.py
@@ -1,6 +1,5 @@
 import os
 import shutil
-import subprocess
 import sys
 
 from config import Config
diff --git a/l2_proposer.py b/l2_proposer.py
index a63a87c..609cf0e 100644
--- a/l2_proposer.py
+++ b/l2_proposer.py
@@ -1,4 +1,3 @@
-import subprocess
 import sys
 
 from config import Config