diff --git a/.github/workflows/pythontest.yaml b/.github/workflows/pythontest.yaml
index 689f12c19..0fb287a98 100644
--- a/.github/workflows/pythontest.yaml
+++ b/.github/workflows/pythontest.yaml
@@ -28,7 +28,7 @@ jobs:
           enable-cache: true
           cache-dependency-glob: "uv.lock"
       - name: Install dependencies
-        run: uv sync --group lint
+        run: uv sync --group lint --all-extras
       - name: Lint with ruff
         run: uv run ruff check .
   test:
diff --git a/conftest.py b/conftest.py
index a90bfd36f..8aaae981b 100644
--- a/conftest.py
+++ b/conftest.py
@@ -5,6 +5,7 @@
 from contextlib import suppress
 
 import pytest
+
 from panoptes.utils.config.client import set_config
 from panoptes.utils.config.server import config_server
 
diff --git a/pyproject.toml b/pyproject.toml
index 51ed5655a..820d2fc4b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -192,6 +192,21 @@ select = [
 ]
 ignore = []
 
+[tool.ruff.lint.isort]
+section-order = [
+    "future",
+    "standard-library",
+    "third-party",
+    "first-party",
+    "local-folder",
+    "panoptes-utils",
+    "panoptes-pocs"
+]
+
+[tool.ruff.lint.isort.sections]
+"panoptes-utils" = ["panoptes.utils"]
+"panoptes-pocs" = ["panoptes.pocs"]
+
 [tool.ruff.format]
 quote-style = "double"
 indent-style = "space"
diff --git a/src/panoptes/pocs/base.py b/src/panoptes/pocs/base.py
index c4dafc441..47b5633b0 100644
--- a/src/panoptes/pocs/base.py
+++ b/src/panoptes/pocs/base.py
@@ -7,9 +7,10 @@
 import os
 from typing import Any
 
+from requests.exceptions import ConnectionError
+
 from panoptes.utils.config import client
 from panoptes.utils.database import PanDB
-from requests.exceptions import ConnectionError
 
 from panoptes.pocs import __version__, hardware
 from panoptes.pocs.utils.logger import get_logger
diff --git a/src/panoptes/pocs/camera/__init__.py b/src/panoptes/pocs/camera/__init__.py
index 7a98b95d6..67aad1ca8 100644
--- a/src/panoptes/pocs/camera/__init__.py
+++ b/src/panoptes/pocs/camera/__init__.py
@@ -6,10 +6,11 @@
 from contextlib import suppress
 
 import requests
+from pydantic import AnyHttpUrl
+
 from panoptes.utils import error
 from panoptes.utils.config.client import get_config
 from panoptes.utils.library import load_module
-from pydantic import AnyHttpUrl
 
 from panoptes.pocs.camera.camera import AbstractCamera  # noqa
 from panoptes.pocs.utils.logger import get_logger
diff --git a/src/panoptes/pocs/camera/camera.py b/src/panoptes/pocs/camera/camera.py
index c15c3dcdd..55855ae13 100644
--- a/src/panoptes/pocs/camera/camera.py
+++ b/src/panoptes/pocs/camera/camera.py
@@ -18,6 +18,7 @@
 import astropy.units as u
 from astropy.io import fits
 from astropy.time import Time
+
 from panoptes.utils import error
 from panoptes.utils.images import fits as fits_utils
 from panoptes.utils.images.misc import crop_data
diff --git a/src/panoptes/pocs/camera/fli.py b/src/panoptes/pocs/camera/fli.py
index 90ab44538..a693f557e 100644
--- a/src/panoptes/pocs/camera/fli.py
+++ b/src/panoptes/pocs/camera/fli.py
@@ -9,6 +9,7 @@
 import numpy as np
 from astropy import units as u
 from astropy.io import fits
+
 from panoptes.utils import error
 
 from panoptes.pocs.camera import libfliconstants as c
diff --git a/src/panoptes/pocs/camera/gphoto/canon.py b/src/panoptes/pocs/camera/gphoto/canon.py
index 7a1db4c08..b620377b9 100644
--- a/src/panoptes/pocs/camera/gphoto/canon.py
+++ b/src/panoptes/pocs/camera/gphoto/canon.py
@@ -8,6 +8,7 @@
 from functools import lru_cache
 
 from astropy import units as u
+
 from panoptes.utils import error
 from panoptes.utils.error import PanError
 from panoptes.utils.time import current_time
diff --git a/src/panoptes/pocs/camera/libasi.py b/src/panoptes/pocs/camera/libasi.py
index b0aaeb4c4..df391512d 100644
--- a/src/panoptes/pocs/camera/libasi.py
+++ b/src/panoptes/pocs/camera/libasi.py
@@ -10,6 +10,7 @@
 
 import numpy as np
 from astropy import units as u
+
 from panoptes.utils import error
 from panoptes.utils.utils import get_quantity_value
 
diff --git a/src/panoptes/pocs/camera/libfli.py b/src/panoptes/pocs/camera/libfli.py
index 61f9518d2..06111390c 100644
--- a/src/panoptes/pocs/camera/libfli.py
+++ b/src/panoptes/pocs/camera/libfli.py
@@ -9,6 +9,7 @@
 
 import numpy as np
 from astropy import units as u
+
 from panoptes.utils import error
 from panoptes.utils.utils import get_quantity_value
 
diff --git a/src/panoptes/pocs/camera/sbig.py b/src/panoptes/pocs/camera/sbig.py
index 736edc5f4..24c59a3c9 100644
--- a/src/panoptes/pocs/camera/sbig.py
+++ b/src/panoptes/pocs/camera/sbig.py
@@ -7,6 +7,7 @@
 from contextlib import suppress
 
 from astropy.io import fits
+
 from panoptes.utils import error
 
 from panoptes.pocs.camera.sbigudrv import INVALID_HANDLE_VALUE, SBIGDriver
diff --git a/src/panoptes/pocs/camera/sbigudrv.py b/src/panoptes/pocs/camera/sbigudrv.py
index 16a62ddce..44e82daa2 100644
--- a/src/panoptes/pocs/camera/sbigudrv.py
+++ b/src/panoptes/pocs/camera/sbigudrv.py
@@ -17,6 +17,7 @@
 import numpy as np
 from astropy import units as u
 from numpy.ctypeslib import as_ctypes
+
 from panoptes.utils import error
 from panoptes.utils.time import CountdownTimer
 from panoptes.utils.utils import get_quantity_value
diff --git a/src/panoptes/pocs/camera/sdk.py b/src/panoptes/pocs/camera/sdk.py
index 04ae014f1..58de49d7a 100644
--- a/src/panoptes/pocs/camera/sdk.py
+++ b/src/panoptes/pocs/camera/sdk.py
@@ -9,6 +9,7 @@
 from contextlib import suppress
 
 from astropy.io import fits
+
 from panoptes.utils import error
 from panoptes.utils.library import load_c_library
 
diff --git a/src/panoptes/pocs/camera/simulator/ccd.py b/src/panoptes/pocs/camera/simulator/ccd.py
index d61e45b93..9e4fb1afb 100644
--- a/src/panoptes/pocs/camera/simulator/ccd.py
+++ b/src/panoptes/pocs/camera/simulator/ccd.py
@@ -12,6 +12,7 @@
 from contextlib import suppress
 
 import astropy.units as u
+
 from panoptes.utils.config.client import get_config
 
 from panoptes.pocs.camera.sdk import AbstractSDKCamera, AbstractSDKDriver
diff --git a/src/panoptes/pocs/camera/simulator/dslr.py b/src/panoptes/pocs/camera/simulator/dslr.py
index 45148dd2a..523e3fe80 100644
--- a/src/panoptes/pocs/camera/simulator/dslr.py
+++ b/src/panoptes/pocs/camera/simulator/dslr.py
@@ -11,6 +11,7 @@
 import numpy as np
 from astropy import units as u
 from astropy.io import fits
+
 from panoptes.utils.images import fits as fits_utils
 from panoptes.utils.time import CountdownTimer
 from panoptes.utils.utils import get_quantity_value
diff --git a/src/panoptes/pocs/camera/zwo.py b/src/panoptes/pocs/camera/zwo.py
index d319c39f6..03581b360 100644
--- a/src/panoptes/pocs/camera/zwo.py
+++ b/src/panoptes/pocs/camera/zwo.py
@@ -13,6 +13,7 @@
 from astropy import units as u
 from astropy.io import fits
 from astropy.time import Time
+
 from panoptes.utils import error
 from panoptes.utils.utils import get_quantity_value
 
diff --git a/src/panoptes/pocs/core.py b/src/panoptes/pocs/core.py
index 4750cf030..a9261eed4 100644
--- a/src/panoptes/pocs/core.py
+++ b/src/panoptes/pocs/core.py
@@ -11,6 +11,7 @@
 
 from astropy import units as u
 from astropy.time import Time
+
 from panoptes.utils.time import CountdownTimer, current_time
 from panoptes.utils.utils import get_free_space
 
diff --git a/src/panoptes/pocs/dome/protocol_astrohaven_simulator.py b/src/panoptes/pocs/dome/protocol_astrohaven_simulator.py
index ab2accde0..134c34df5 100644
--- a/src/panoptes/pocs/dome/protocol_astrohaven_simulator.py
+++ b/src/panoptes/pocs/dome/protocol_astrohaven_simulator.py
@@ -10,9 +10,10 @@
 import threading
 import time
 
-from panoptes.utils.serial.handlers.protocol_no_op import NoOpSerial
 from serial import serialutil
 
+from panoptes.utils.serial.handlers.protocol_no_op import NoOpSerial
+
 from panoptes.pocs.dome import astrohaven
 from panoptes.pocs.utils.logger import get_logger
 
@@ -338,7 +339,7 @@ def write(self, data):
             SerialTimeoutException: In case a write timeout is configured for
                 the port and the time is exceeded.
         """
-        if not isinstance(data, (bytes, bytearray)):
+        if not isinstance(data, bytes | bytearray):
             raise ValueError("write takes bytes")
         data = bytes(data)  # Make sure it can't change.
         self.logger.info(f"AstrohavenSerialSimulator.write({data!r})")
diff --git a/src/panoptes/pocs/filterwheel/filterwheel.py b/src/panoptes/pocs/filterwheel/filterwheel.py
index d7ec6b528..d34727d8e 100644
--- a/src/panoptes/pocs/filterwheel/filterwheel.py
+++ b/src/panoptes/pocs/filterwheel/filterwheel.py
@@ -10,6 +10,7 @@
 from contextlib import suppress
 
 from astropy import units as u
+
 from panoptes.utils import error
 from panoptes.utils.utils import listify
 
diff --git a/src/panoptes/pocs/filterwheel/simulator.py b/src/panoptes/pocs/filterwheel/simulator.py
index 5cf1b4f28..f904b4fb5 100644
--- a/src/panoptes/pocs/filterwheel/simulator.py
+++ b/src/panoptes/pocs/filterwheel/simulator.py
@@ -10,6 +10,7 @@
 import threading
 
 from astropy import units as u
+
 from panoptes.utils import error
 
 from panoptes.pocs.filterwheel import AbstractFilterWheel
diff --git a/src/panoptes/pocs/filterwheel/zwo.py b/src/panoptes/pocs/filterwheel/zwo.py
index 9c5aee59f..130c2fb84 100644
--- a/src/panoptes/pocs/filterwheel/zwo.py
+++ b/src/panoptes/pocs/filterwheel/zwo.py
@@ -7,6 +7,7 @@
 from contextlib import suppress
 
 from astropy import units as u
+
 from panoptes.utils import error
 
 from panoptes.pocs.camera.camera import AbstractCamera
diff --git a/src/panoptes/pocs/focuser/birger.py b/src/panoptes/pocs/focuser/birger.py
index 0beb23364..ace636797 100644
--- a/src/panoptes/pocs/focuser/birger.py
+++ b/src/panoptes/pocs/focuser/birger.py
@@ -10,6 +10,7 @@
 from contextlib import suppress
 
 import serial
+
 from panoptes.utils import error
 
 from panoptes.pocs.focuser.serial import AbstractSerialFocuser
diff --git a/src/panoptes/pocs/focuser/focuser.py b/src/panoptes/pocs/focuser/focuser.py
index 316b7f976..3bd9aa7ca 100644
--- a/src/panoptes/pocs/focuser/focuser.py
+++ b/src/panoptes/pocs/focuser/focuser.py
@@ -12,10 +12,11 @@
 
 import numpy as np
 from astropy.modeling import fitting, models
+from scipy.ndimage import binary_dilation
+
 from panoptes.utils.images import focus as focus_utils
 from panoptes.utils.images.misc import mask_saturated
 from panoptes.utils.time import current_time
-from scipy.ndimage import binary_dilation
 
 from panoptes.pocs.base import PanBase
 from panoptes.pocs.utils.plotting import make_autofocus_plot
diff --git a/src/panoptes/pocs/images.py b/src/panoptes/pocs/images.py
index d077ff1ce..a161b58d6 100644
--- a/src/panoptes/pocs/images.py
+++ b/src/panoptes/pocs/images.py
@@ -13,6 +13,7 @@
 from astropy.coordinates import FK5, EarthLocation, SkyCoord
 from astropy.io import fits
 from astropy.time import Time
+
 from panoptes.utils.images import fits as fits_utils
 
 from panoptes.pocs.base import PanBase
diff --git a/src/panoptes/pocs/mount/bisque.py b/src/panoptes/pocs/mount/bisque.py
index fcea59dcd..537883969 100644
--- a/src/panoptes/pocs/mount/bisque.py
+++ b/src/panoptes/pocs/mount/bisque.py
@@ -12,6 +12,7 @@
 
 from astropy import units as u
 from astropy.coordinates import SkyCoord
+
 from panoptes.utils import error
 
 from panoptes.pocs.mount import AbstractMount
diff --git a/src/panoptes/pocs/mount/ioptron/base.py b/src/panoptes/pocs/mount/ioptron/base.py
index d1afce802..3ee31ccab 100644
--- a/src/panoptes/pocs/mount/ioptron/base.py
+++ b/src/panoptes/pocs/mount/ioptron/base.py
@@ -11,6 +11,7 @@
 from astropy.coordinates import Latitude, Longitude, SkyCoord
 from astropy.coordinates.earth import EarthLocation
 from astropy.time import Time
+
 from panoptes.utils import error as error
 from panoptes.utils.time import current_time
 
diff --git a/src/panoptes/pocs/mount/mount.py b/src/panoptes/pocs/mount/mount.py
index e390a9547..8b0d5f7ff 100644
--- a/src/panoptes/pocs/mount/mount.py
+++ b/src/panoptes/pocs/mount/mount.py
@@ -13,6 +13,7 @@
 
 from astropy import units as u
 from astropy.coordinates import EarthLocation, SkyCoord
+
 from panoptes.utils import error
 from panoptes.utils.serializers import from_yaml
 from panoptes.utils.time import CountdownTimer, current_time
diff --git a/src/panoptes/pocs/mount/simulator.py b/src/panoptes/pocs/mount/simulator.py
index d3a98fe05..7a4d84a88 100644
--- a/src/panoptes/pocs/mount/simulator.py
+++ b/src/panoptes/pocs/mount/simulator.py
@@ -8,6 +8,7 @@
 from threading import Timer
 
 from astropy import units as u
+
 from panoptes.utils import error
 from panoptes.utils.time import current_time
 
diff --git a/src/panoptes/pocs/observatory.py b/src/panoptes/pocs/observatory.py
index bb8e37ad3..1818046cb 100644
--- a/src/panoptes/pocs/observatory.py
+++ b/src/panoptes/pocs/observatory.py
@@ -14,6 +14,7 @@
 from astropy import units as u
 from astropy.coordinates import get_body
 from astropy.io.fits import setval
+
 from panoptes.utils import error
 from panoptes.utils import images as img_utils
 from panoptes.utils.images import fits as fits_utils
diff --git a/src/panoptes/pocs/scheduler/constraint.py b/src/panoptes/pocs/scheduler/constraint.py
index 133446afb..d5c955875 100644
--- a/src/panoptes/pocs/scheduler/constraint.py
+++ b/src/panoptes/pocs/scheduler/constraint.py
@@ -12,6 +12,7 @@
 from astropy import units as u
 from astropy.time import Time
 from dateutil.parser import parse as parse_date
+
 from panoptes.utils import error
 from panoptes.utils import horizon as horizon_utils
 from panoptes.utils.utils import get_quantity_value
@@ -80,7 +81,7 @@ def __init__(self, horizon=None, obstructions=None, *args, **kwargs):
 
         if isinstance(horizon, horizon_utils.Horizon):
             self.horizon_line = horizon.horizon_line
-        elif horizon is None or isinstance(horizon, (int, float, u.Quantity)):
+        elif horizon is None or isinstance(horizon, int | float | u.Quantity):
             obstruction_list = obstructions
             default_horizon = horizon
 
diff --git a/src/panoptes/pocs/scheduler/field.py b/src/panoptes/pocs/scheduler/field.py
index e0264626f..f39b30aa9 100644
--- a/src/panoptes/pocs/scheduler/field.py
+++ b/src/panoptes/pocs/scheduler/field.py
@@ -6,6 +6,7 @@
 
 from astroplan import FixedTarget
 from astropy.coordinates import SkyCoord
+
 from panoptes.utils.time import current_time
 from panoptes.utils.utils import altaz_to_radec
 
diff --git a/src/panoptes/pocs/scheduler/observation/base.py b/src/panoptes/pocs/scheduler/observation/base.py
index 2c9884eef..d4f6bc906 100644
--- a/src/panoptes/pocs/scheduler/observation/base.py
+++ b/src/panoptes/pocs/scheduler/observation/base.py
@@ -10,10 +10,11 @@
 from pathlib import Path
 
 from astropy import units as u
+from pydantic.dataclasses import dataclass
+
 from panoptes.utils import error
 from panoptes.utils.library import load_module
 from panoptes.utils.utils import get_quantity_value, listify
-from pydantic.dataclasses import dataclass
 
 from panoptes.pocs.base import PanBase
 from panoptes.pocs.scheduler import create_constraints_from_config
diff --git a/src/panoptes/pocs/scheduler/observation/bias.py b/src/panoptes/pocs/scheduler/observation/bias.py
index 78be3f13c..82c3a2344 100644
--- a/src/panoptes/pocs/scheduler/observation/bias.py
+++ b/src/panoptes/pocs/scheduler/observation/bias.py
@@ -7,6 +7,7 @@
 import os
 
 from astropy import units as u
+
 from panoptes.utils.config.client import get_config
 
 from panoptes.pocs.scheduler.field import Field
diff --git a/src/panoptes/pocs/scheduler/observation/compound.py b/src/panoptes/pocs/scheduler/observation/compound.py
index 52467bd5c..a2a25f49d 100644
--- a/src/panoptes/pocs/scheduler/observation/compound.py
+++ b/src/panoptes/pocs/scheduler/observation/compound.py
@@ -2,6 +2,7 @@
 
 import numpy as np
 from astropy import units as u
+
 from panoptes.utils.utils import get_quantity_value, listify
 
 from panoptes.pocs.scheduler.observation.base import Observation as BaseObservation
diff --git a/src/panoptes/pocs/scheduler/observation/dark.py b/src/panoptes/pocs/scheduler/observation/dark.py
index 99780f8d5..3c0030296 100644
--- a/src/panoptes/pocs/scheduler/observation/dark.py
+++ b/src/panoptes/pocs/scheduler/observation/dark.py
@@ -7,6 +7,7 @@
 import os
 
 from astropy import units as u
+
 from panoptes.utils.utils import get_quantity_value, listify
 
 from panoptes.pocs.scheduler.field import Field
diff --git a/src/panoptes/pocs/scheduler/scheduler.py b/src/panoptes/pocs/scheduler/scheduler.py
index a24a5fde6..10a66df99 100644
--- a/src/panoptes/pocs/scheduler/scheduler.py
+++ b/src/panoptes/pocs/scheduler/scheduler.py
@@ -14,6 +14,7 @@
 from astroplan import Observer
 from astropy import units as u
 from astropy.coordinates import get_body
+
 from panoptes.utils import error
 from panoptes.utils.serializers import from_yaml
 from panoptes.utils.time import current_time
diff --git a/src/panoptes/pocs/sensor/power.py b/src/panoptes/pocs/sensor/power.py
index 6a037e7ef..2a123f8f7 100644
--- a/src/panoptes/pocs/sensor/power.py
+++ b/src/panoptes/pocs/sensor/power.py
@@ -15,6 +15,7 @@
 
 import pandas as pd
 from astropy import units as u
+
 from panoptes.utils import error
 from panoptes.utils.serial.device import SerialDevice, find_serial_port
 from panoptes.utils.serializers import from_json, to_json
diff --git a/src/panoptes/pocs/sensor/remote.py b/src/panoptes/pocs/sensor/remote.py
index 5527ffdba..70f0caeea 100644
--- a/src/panoptes/pocs/sensor/remote.py
+++ b/src/panoptes/pocs/sensor/remote.py
@@ -5,6 +5,7 @@
 """
 
 import requests
+
 from panoptes.utils import error
 from panoptes.utils.config.client import get_config
 from panoptes.utils.time import current_time
diff --git a/src/panoptes/pocs/state/machine.py b/src/panoptes/pocs/state/machine.py
index f8349f039..4dcfd5c17 100644
--- a/src/panoptes/pocs/state/machine.py
+++ b/src/panoptes/pocs/state/machine.py
@@ -1,13 +1,14 @@
 from contextlib import suppress
 from pathlib import Path
 
+from transitions import Machine
+from transitions.extensions.states import Tags as MachineState
+
 from panoptes.utils import error
 from panoptes.utils.config.client import get_config
 from panoptes.utils.library import load_module
 from panoptes.utils.serializers import from_yaml
 from panoptes.utils.utils import listify
-from transitions import Machine
-from transitions.extensions.states import Tags as MachineState
 
 
 class PanStateMachine(Machine):
diff --git a/src/panoptes/pocs/state/states/default/pointing.py b/src/panoptes/pocs/state/states/default/pointing.py
index 57f2ceeee..633e7a5a7 100644
--- a/src/panoptes/pocs/state/states/default/pointing.py
+++ b/src/panoptes/pocs/state/states/default/pointing.py
@@ -5,6 +5,7 @@
 """
 
 import numpy as np
+
 from panoptes.utils.time import wait_for_events
 
 from panoptes.pocs.images import Image
diff --git a/src/panoptes/pocs/state/states/default/ready.py b/src/panoptes/pocs/state/states/default/ready.py
index c1b83a3da..1b052ee72 100644
--- a/src/panoptes/pocs/state/states/default/ready.py
+++ b/src/panoptes/pocs/state/states/default/ready.py
@@ -5,6 +5,7 @@
 """
 
 from astropy import units as u
+
 from panoptes.utils.time import current_time
 
 
diff --git a/src/panoptes/pocs/utils/alignment.py b/src/panoptes/pocs/utils/alignment.py
index 09a46c259..79244ad99 100644
--- a/src/panoptes/pocs/utils/alignment.py
+++ b/src/panoptes/pocs/utils/alignment.py
@@ -18,13 +18,14 @@
 from matplotlib import pyplot as plt
 from matplotlib.figure import Figure
 from matplotlib.patches import Circle
-from panoptes.utils.error import PanError
-from panoptes.utils.images import fits
-from panoptes.utils.images.fits import get_solve_field, get_wcsinfo, getdata
 from rich import print
 from skimage.feature import canny
 from skimage.transform import hough_circle, hough_circle_peaks
 
+from panoptes.utils.error import PanError
+from panoptes.utils.images import fits
+from panoptes.utils.images.fits import get_solve_field, get_wcsinfo, getdata
+
 warnings.simplefilter("ignore", category=FITSFixedWarning)
 
 
diff --git a/src/panoptes/pocs/utils/cli/camera.py b/src/panoptes/pocs/utils/cli/camera.py
index 3eb28a1e9..c9f06918c 100644
--- a/src/panoptes/pocs/utils/cli/camera.py
+++ b/src/panoptes/pocs/utils/cli/camera.py
@@ -16,12 +16,6 @@
 import typer
 from astropy.io import fits
 from astropy.stats import sigma_clipped_stats
-from panoptes.utils.config.client import get_config, set_config
-from panoptes.utils.error import PanError
-from panoptes.utils.images import cr2 as cr2_utils
-from panoptes.utils.images import make_pretty_image
-from panoptes.utils.images.fits import fpack, get_solve_field, getdata
-from panoptes.utils.time import current_time
 from rich import print
 from rich.console import Group
 from rich.live import Live
@@ -38,6 +32,13 @@
 from rich.table import Table
 from rich.text import Text
 
+from panoptes.utils.config.client import get_config, set_config
+from panoptes.utils.error import PanError
+from panoptes.utils.images import cr2 as cr2_utils
+from panoptes.utils.images import make_pretty_image
+from panoptes.utils.images.fits import fpack, get_solve_field, getdata
+from panoptes.utils.time import current_time
+
 from panoptes.pocs.camera import (
     AbstractCamera,
     create_cameras_from_config,
diff --git a/src/panoptes/pocs/utils/cli/config.py b/src/panoptes/pocs/utils/cli/config.py
index 629a9f12e..0e433212d 100644
--- a/src/panoptes/pocs/utils/cli/config.py
+++ b/src/panoptes/pocs/utils/cli/config.py
@@ -9,11 +9,12 @@
 
 import typer
 from astropy import units as u
-from panoptes.utils.config.client import get_config, server_is_running, set_config
 from pydantic import BaseModel
 from rich import print, prompt
 from rich.console import Console
 
+from panoptes.utils.config.client import get_config, server_is_running, set_config
+
 from panoptes.pocs.utils.logger import get_logger
 
 
diff --git a/src/panoptes/pocs/utils/cli/mount.py b/src/panoptes/pocs/utils/cli/mount.py
index a0bec9166..ac8e5761e 100644
--- a/src/panoptes/pocs/utils/cli/mount.py
+++ b/src/panoptes/pocs/utils/cli/mount.py
@@ -15,12 +15,13 @@
 from astropy import units as u
 from astropy.coordinates import AltAz
 from human_readable import time_delta as friendly_time_delta
+from pick import pick
+from rich import print
+
 from panoptes.utils.config.client import set_config
 from panoptes.utils.rs232 import SerialData
 from panoptes.utils.serial.device import get_serial_port_info
 from panoptes.utils.time import CountdownTimer, current_time
-from pick import pick
-from rich import print
 
 from panoptes.pocs.mount import create_mount_from_config
 from panoptes.pocs.mount.ioptron import MountInfo
diff --git a/src/panoptes/pocs/utils/cli/network.py b/src/panoptes/pocs/utils/cli/network.py
index ed7069df2..396546933 100644
--- a/src/panoptes/pocs/utils/cli/network.py
+++ b/src/panoptes/pocs/utils/cli/network.py
@@ -13,11 +13,12 @@
 import requests
 import typer
 from google.cloud import firestore, storage
-from panoptes.utils.config.client import get_config, set_config
 from rich import print
 from watchdog.events import FileSystemEventHandler
 from watchdog.observers import Observer
 
+from panoptes.utils.config.client import get_config, set_config
+
 from panoptes.pocs.utils.cloud import upload_image
 
 app = typer.Typer(no_args_is_help=True)
diff --git a/src/panoptes/pocs/utils/cli/run.py b/src/panoptes/pocs/utils/cli/run.py
index e4dcdbfd8..0bb7ccfe3 100644
--- a/src/panoptes/pocs/utils/cli/run.py
+++ b/src/panoptes/pocs/utils/cli/run.py
@@ -12,10 +12,11 @@
 
 import typer
 from astropy.coordinates import SkyCoord
+from rich import print
+
 from panoptes.utils.error import PanError
 from panoptes.utils.time import current_time
 from panoptes.utils.utils import altaz_to_radec, listify
-from rich import print
 
 from panoptes.pocs.core import POCS
 from panoptes.pocs.scheduler.field import Field
diff --git a/src/panoptes/pocs/utils/coords.py b/src/panoptes/pocs/utils/coords.py
index 8765b72e1..c54fa9146 100644
--- a/src/panoptes/pocs/utils/coords.py
+++ b/src/panoptes/pocs/utils/coords.py
@@ -7,6 +7,7 @@
 from astropy.coordinates.name_resolve import NameResolveError
 from astropy.time import Time
 from astroquery.jplhorizons import Horizons
+
 from panoptes.utils.time import current_time
 
 
diff --git a/src/panoptes/pocs/utils/location.py b/src/panoptes/pocs/utils/location.py
index eec9f0464..c8fe02c02 100644
--- a/src/panoptes/pocs/utils/location.py
+++ b/src/panoptes/pocs/utils/location.py
@@ -11,6 +11,7 @@
 from astropy import units as u
 from astropy.coordinates import EarthLocation
 from astropy.utils.iers import Conf as iers_conf
+
 from panoptes.utils import error
 from panoptes.utils.config.client import get_config
 from panoptes.utils.utils import get_quantity_value
diff --git a/src/panoptes/pocs/utils/plotting.py b/src/panoptes/pocs/utils/plotting.py
index 2dcc44148..c68a62617 100644
--- a/src/panoptes/pocs/utils/plotting.py
+++ b/src/panoptes/pocs/utils/plotting.py
@@ -6,6 +6,7 @@
 
 from matplotlib.colors import LogNorm
 from matplotlib.figure import Figure
+
 from panoptes.utils.images.plot import add_colorbar, get_palette
 
 from panoptes.pocs.utils.logger import get_logger
diff --git a/src/panoptes/pocs/utils/service/power.py b/src/panoptes/pocs/utils/service/power.py
index a27f2e56c..764d9d16f 100644
--- a/src/panoptes/pocs/utils/service/power.py
+++ b/src/panoptes/pocs/utils/service/power.py
@@ -12,9 +12,10 @@
 
 from fastapi import FastAPI
 from fastapi_utils.enums import StrEnum
-from panoptes.utils.config.client import get_config
 from pydantic import BaseModel
 
+from panoptes.utils.config.client import get_config
+
 from panoptes.pocs.sensor.power import PowerBoard
 
 
diff --git a/src/panoptes/pocs/utils/service/weather.py b/src/panoptes/pocs/utils/service/weather.py
index b0d28fb1b..fbe033f55 100644
--- a/src/panoptes/pocs/utils/service/weather.py
+++ b/src/panoptes/pocs/utils/service/weather.py
@@ -11,9 +11,10 @@
 from threading import Thread
 
 from fastapi import FastAPI
-from panoptes.utils.config.client import get_config
 from serial.tools.list_ports import comports as get_comports
 
+from panoptes.utils.config.client import get_config
+
 from panoptes.pocs.sensor.weather import WeatherStation
 
 app_objects = {}
diff --git a/tests/bisque/test_mount.py b/tests/bisque/test_mount.py
index 7206ef732..873806b98 100644
--- a/tests/bisque/test_mount.py
+++ b/tests/bisque/test_mount.py
@@ -3,6 +3,7 @@
 import pytest
 from astropy import units as u
 from astropy.coordinates import EarthLocation
+
 from panoptes.utils.config.client import get_config
 from panoptes.utils.time import current_time
 from panoptes.utils.utils import altaz_to_radec
diff --git a/tests/bisque/test_run.py b/tests/bisque/test_run.py
index b31983a14..d27c5241e 100644
--- a/tests/bisque/test_run.py
+++ b/tests/bisque/test_run.py
@@ -2,6 +2,7 @@
 
 import pytest
 from astropy.coordinates import EarthLocation
+
 from panoptes.utils.config.client import get_config
 from panoptes.utils.time import current_time
 from panoptes.utils.utils import altaz_to_radec
diff --git a/tests/scheduler/test_base_scheduler.py b/tests/scheduler/test_base_scheduler.py
index 84649df8b..342e5b47a 100644
--- a/tests/scheduler/test_base_scheduler.py
+++ b/tests/scheduler/test_base_scheduler.py
@@ -2,6 +2,7 @@
 from astroplan import Observer
 from astropy import units as u
 from astropy.coordinates import EarthLocation
+
 from panoptes.utils import error
 from panoptes.utils.config.client import get_config, set_config
 from panoptes.utils.serializers import from_yaml
diff --git a/tests/scheduler/test_dispatch_scheduler.py b/tests/scheduler/test_dispatch_scheduler.py
index d250d4789..1a8b63e7c 100644
--- a/tests/scheduler/test_dispatch_scheduler.py
+++ b/tests/scheduler/test_dispatch_scheduler.py
@@ -7,6 +7,7 @@
 from astropy import units as u
 from astropy.coordinates import EarthLocation
 from astropy.time import Time
+
 from panoptes.utils.config.client import get_config
 
 from panoptes.pocs.scheduler.constraint import Duration, MoonAvoidance
diff --git a/tests/scheduler/test_scheduler.py b/tests/scheduler/test_scheduler.py
index 4c5106ec8..8b0ef4baf 100644
--- a/tests/scheduler/test_scheduler.py
+++ b/tests/scheduler/test_scheduler.py
@@ -1,5 +1,6 @@
 import pytest
 import requests
+
 from panoptes.utils import error
 from panoptes.utils.config.client import set_config
 from panoptes.utils.serializers import to_json
diff --git a/tests/test_camera.py b/tests/test_camera.py
index 0344273db..d96f28b21 100644
--- a/tests/test_camera.py
+++ b/tests/test_camera.py
@@ -8,6 +8,7 @@
 import pytest
 import requests
 from astropy.io import fits
+
 from panoptes.utils import error
 from panoptes.utils.config.client import get_config, set_config
 from panoptes.utils.error import NotFound
diff --git a/tests/test_constraints.py b/tests/test_constraints.py
index 68d98d665..a86aba461 100644
--- a/tests/test_constraints.py
+++ b/tests/test_constraints.py
@@ -5,6 +5,7 @@
 from astropy import units as u
 from astropy.coordinates import EarthLocation, get_body
 from astropy.time import Time
+
 from panoptes.utils import horizon as horizon_utils
 from panoptes.utils.config.client import get_config
 from panoptes.utils.error import PanError
diff --git a/tests/test_dome_astrohaven.py b/tests/test_dome_astrohaven.py
index 90a0b05a9..026ba8644 100644
--- a/tests/test_dome_astrohaven.py
+++ b/tests/test_dome_astrohaven.py
@@ -3,6 +3,7 @@
 
 import pytest
 import serial
+
 from panoptes.utils.config.client import set_config
 
 from panoptes.pocs import hardware
diff --git a/tests/test_dome_simulator.py b/tests/test_dome_simulator.py
index 03794c1de..c82d39b2c 100644
--- a/tests/test_dome_simulator.py
+++ b/tests/test_dome_simulator.py
@@ -1,4 +1,5 @@
 import pytest
+
 from panoptes.utils.config.client import set_config
 
 from panoptes.pocs.dome import create_dome_simulator, simulator
diff --git a/tests/test_filterwheel.py b/tests/test_filterwheel.py
index 129574b5c..f811ea249 100644
--- a/tests/test_filterwheel.py
+++ b/tests/test_filterwheel.py
@@ -3,6 +3,7 @@
 
 import pytest
 from astropy import units as u
+
 from panoptes.utils import error
 
 from panoptes.pocs.camera.simulator.dslr import Camera as SimCamera
diff --git a/tests/test_focuser.py b/tests/test_focuser.py
index 2ca980cd2..be9dbb615 100644
--- a/tests/test_focuser.py
+++ b/tests/test_focuser.py
@@ -3,6 +3,7 @@
 from threading import Thread
 
 import pytest
+
 from panoptes.utils import error
 from panoptes.utils.config.helpers import load_config
 
diff --git a/tests/test_images.py b/tests/test_images.py
index 43eaeb72c..2cc911992 100644
--- a/tests/test_images.py
+++ b/tests/test_images.py
@@ -5,6 +5,7 @@
 import pytest
 from astropy import units as u
 from astropy.coordinates import SkyCoord
+
 from panoptes.utils.error import SolveError, Timeout
 
 from panoptes.pocs.images import Image, OffsetError
diff --git a/tests/test_ioptron.py b/tests/test_ioptron.py
index 5c7856e26..a0e440b9f 100644
--- a/tests/test_ioptron.py
+++ b/tests/test_ioptron.py
@@ -4,6 +4,7 @@
 import pytest
 from astropy import units as u
 from astropy.coordinates import EarthLocation
+
 from panoptes.utils.config.client import get_config
 
 from panoptes.pocs.images import OffsetError
diff --git a/tests/test_mount.py b/tests/test_mount.py
index 602ef5d50..fd62ffcfb 100644
--- a/tests/test_mount.py
+++ b/tests/test_mount.py
@@ -3,6 +3,7 @@
 import pytest
 import requests
 from astropy.utils.iers import Conf as iers_conf
+
 from panoptes.utils import error
 from panoptes.utils.config.client import get_config, set_config
 from panoptes.utils.serializers import to_json
diff --git a/tests/test_mount_simulator.py b/tests/test_mount_simulator.py
index 4b4fadb79..2b5de2446 100644
--- a/tests/test_mount_simulator.py
+++ b/tests/test_mount_simulator.py
@@ -3,6 +3,7 @@
 import pytest
 from astropy import units as u
 from astropy.coordinates import EarthLocation, SkyCoord
+
 from panoptes.utils import error
 from panoptes.utils.config.client import get_config
 from panoptes.utils.utils import altaz_to_radec
diff --git a/tests/test_observatory.py b/tests/test_observatory.py
index a6167ad17..52f3851b6 100644
--- a/tests/test_observatory.py
+++ b/tests/test_observatory.py
@@ -5,6 +5,7 @@
 import requests
 from astropy.coordinates import get_body
 from astropy.time import Time
+
 from panoptes.utils import error
 from panoptes.utils.config.client import set_config
 from panoptes.utils.serializers import to_json
diff --git a/tests/test_pocs.py b/tests/test_pocs.py
index bf8f4d51a..0b1f652c2 100644
--- a/tests/test_pocs.py
+++ b/tests/test_pocs.py
@@ -5,6 +5,7 @@
 import pytest
 import requests
 from astropy import units as u
+
 from panoptes.utils.config.client import set_config
 from panoptes.utils.serializers import to_json, to_yaml
 from panoptes.utils.time import current_time
diff --git a/tests/test_sensors.py b/tests/test_sensors.py
index 015e03401..0f66454dc 100644
--- a/tests/test_sensors.py
+++ b/tests/test_sensors.py
@@ -2,6 +2,7 @@
 
 import pytest
 import responses
+
 from panoptes.utils import error
 
 from panoptes.pocs.sensor import power, remote
diff --git a/tests/test_state_machine.py b/tests/test_state_machine.py
index af9d54bf2..f10fa35b2 100644
--- a/tests/test_state_machine.py
+++ b/tests/test_state_machine.py
@@ -1,6 +1,7 @@
 import os
 
 import pytest
+
 from panoptes.utils import error
 from panoptes.utils.serializers import to_yaml