diff --git a/src/aarecommon/config/logger.py b/src/aarecommon/config/logger.py
index dd826ce..5a810a4 100644
--- a/src/aarecommon/config/logger.py
+++ b/src/aarecommon/config/logger.py
@@ -82,7 +82,7 @@ def get_config_path(env: str = "dev") -> Path:
 
 # TODO fix logging.
 def setup_logger(
-    name="aareDAQ", base_dir: str | None = f"~/tmp/mxlogs/", config_path: str | None = None
+    name="aareDAQ", base_dir: str | None = "~/tmp/mxlogs/", config_path: str | None = None
 ):
     # switch to production mode using: $ APP_ENV=prod python main.py
     env = os.getenv("APP_ENV", "dev")  # default: dev
diff --git a/src/aarecommon/errors/codes.py b/src/aarecommon/errors/codes.py
index b0e2fa6..d5c2699 100644
--- a/src/aarecommon/errors/codes.py
+++ b/src/aarecommon/errors/codes.py
@@ -75,9 +75,7 @@ class AareErrorCode(StrEnum):
     AXC_FAILED = "AXC_FAILED"
     AUTO_RASTER_SAMPLE_SKIPPED = "AUTO_RASTER_SAMPLE_SKIPPED"
     TRANSFORMATION_INVALID_EXCEPTION = "TRANSFORMATION_INVALID_EXCEPTION"
-    MAGNET_POSITION_SENSOR_ERROR = (
-        "MAGNET_POSITION_SENSOR_ERROR"  
-    )
+    MAGNET_POSITION_SENSOR_ERROR = "MAGNET_POSITION_SENSOR_ERROR"
     SMART_MAGNET_FAULT_EXCEPTION = "SMART_MAGNET_FAULT_EXCEPTION"
     DOOR_SAFETY_ERROR = "DOOR_SAFETY_ERROR"
 
diff --git a/src/aarecommon/math/find_xtal.py b/src/aarecommon/math/find_xtal.py
index 1cb0f2d..3c76e5d 100644
--- a/src/aarecommon/math/find_xtal.py
+++ b/src/aarecommon/math/find_xtal.py
@@ -12,7 +12,7 @@ logger = setup_logger("aareDAQ")
 def identify_crystal_raster(result, r: RasterGridRequest) -> CenterOfMassModel | None:
     images = result.images
     if images and any(getattr(img, "spots_low_res", 0) for img in images):
-        logger.debug(f"Find image by maximum number of low resolution spots")
+        logger.debug("Find image by maximum number of low resolution spots")
         max_image = max(images, key=lambda img: img.spots_low_res)
         logger.debug(f"Image with maximum spots_low_res: {max_image}")
         logger.debug(f"Maximum spots_low_res value: {max_image.spots_low_res}")
diff --git a/src/aarecommon/models/auth.py b/src/aarecommon/models/auth.py
index 2960c5a..84c3f8d 100644
--- a/src/aarecommon/models/auth.py
+++ b/src/aarecommon/models/auth.py
@@ -1,6 +1,5 @@
 from enum import Enum
 from pydantic import BaseModel
-from datetime import datetime
 
 
 class BatonRequestStatus(Enum):
@@ -58,7 +57,8 @@ class BatonStatus(BaseModel):
 
 
 def get_user():
-    import os, getpass
+    import os
+    import getpass
 
     try:
         return os.getlogin()
diff --git a/src/aarecommon/models/models.py b/src/aarecommon/models/models.py
index 643d4e2..6c14169 100644
--- a/src/aarecommon/models/models.py
+++ b/src/aarecommon/models/models.py
@@ -1,7 +1,6 @@
 import re
 from dataclasses import dataclass
 from enum import Enum
-from pathlib import Path
 from typing import Annotated, List, Literal, Optional, Tuple
 
 from aarecommon.models.beamline import MXBeamline
@@ -102,11 +101,7 @@ class DataCollectionParameters(BaseModel):
             default_value = "{date}/{prefix}"
             return default_value
 
-        # Strip trailing slashes and store original value for comparison
         v = str(v).strip("/")  # Ensure it's a string and no trailing slashes
-        original_value = v
-
-        # Replace spaces with underscores
         v = v.replace(" ", "_")
 
         # Validate directory pattern with macros and allowed characters
diff --git a/tests/test_models_extra.py b/tests/test_models_extra.py
index e7f863e..5905a6e 100644
--- a/tests/test_models_extra.py
+++ b/tests/test_models_extra.py
@@ -1,4 +1,3 @@
-import pytest
 from aarecommon.models.models import (
     BeamlineStateEnum,
     BeamMarkCoeffModel,