diff --git a/work_helpers/_natural_sort.py b/work_helpers/_natural_sort.py
index 1c06d05..e5be27a 100644
--- a/work_helpers/_natural_sort.py
+++ b/work_helpers/_natural_sort.py
@@ -11,7 +11,6 @@ from http://www.codinghorror.com/blog/2007/12/sorting-for-humans-natural-sort-or
 
 import re
 
-
 _NATURAL_SORT_REGEX_DIGITS = re.compile("([0-9]+)")
 
 
diff --git a/work_helpers/excel2changelog.py b/work_helpers/excel2changelog.py
index 1f63a81..34506fd 100644
--- a/work_helpers/excel2changelog.py
+++ b/work_helpers/excel2changelog.py
@@ -1,5 +1,6 @@
-import click
 import re
+
+import click
 import pyperclip
 
 a2z = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -64,7 +65,7 @@ def clipboard_to_changelog(
     )
     line_count = len(result)
     if line_count == 1:
-        print(f"Copied one line to the clipboard")
+        print("Copied one line to the clipboard")
         print(result[0])
     else:
         print(f"Copied {line_count} lines to the clipboard")
diff --git a/work_helpers/excel2pylist.py b/work_helpers/excel2pylist.py
index 9a74d65..d21df20 100644
--- a/work_helpers/excel2pylist.py
+++ b/work_helpers/excel2pylist.py
@@ -31,8 +31,7 @@ def pad_field(index, t):
     value, length = t
     if index == 0:
         return value.rjust(length)
-    else:
-        return value.ljust(length)
+    return value.ljust(length)
 
 
 def pad_fields(iterable, lengths):
diff --git a/work_helpers/password.py b/work_helpers/password.py
index ee2fa9b..f9c169e 100644
--- a/work_helpers/password.py
+++ b/work_helpers/password.py
@@ -1,8 +1,8 @@
-import click
 import itertools
 import random
-import pyperclip
 
+import click
+import pyperclip
 
 lowers = "abcdefghijklmnopqrstuvwxyz"
 uppers = lowers.upper()
diff --git a/work_helpers/random_int.py b/work_helpers/random_int.py
index 9f18dc9..5d5d03d 100644
--- a/work_helpers/random_int.py
+++ b/work_helpers/random_int.py
@@ -1,5 +1,6 @@
-import click
 import random
+
+import click
 import pyperclip
 
 
diff --git a/work_helpers/sensospot_rename.py b/work_helpers/sensospot_rename.py
index 6400dd0..aa8d8f1 100644
--- a/work_helpers/sensospot_rename.py
+++ b/work_helpers/sensospot_rename.py
@@ -1,9 +1,9 @@
 """rename sensospot images"""
 
-import click
 import pathlib
 import shutil
 
+import click
 
 RENAME_MAP_NAME = "rename_map.txt"
 IMAGE_SUFFIXES = {".tif", ".jpg"}
@@ -50,7 +50,7 @@ def _parse_rename_map(content: str) -> tuple[str, str]:
     for i, line in enumerate(lines, start=1):
         if not line or line.startswith("#"):
             continue
-        if not "\t" in line:
+        if "\t" not in line:
             raise ValueError(f"No tab in line {i}: '{line}'")
         yield line.split("\t", maxsplit=1)
 
@@ -81,7 +81,7 @@ def sensospot_rename(directory):
     if not map_file.is_file():
         write_rename_map(map_file)
         click.echo(f"Prepared rename map at '{map_file!s}'")
-        click.echo(f"Rerun the command after editing the file.")
+        click.echo("Rerun the command after editing the file.")
     else:
         click.echo(f"Reading rename map at '{map_file!s}'")
         try:
diff --git a/work_helpers/sg_mbp_build.py b/work_helpers/sg_mbp_build.py
index 2bbf416..f73ea6d 100644
--- a/work_helpers/sg_mbp_build.py
+++ b/work_helpers/sg_mbp_build.py
@@ -1,12 +1,12 @@
-import click
 import pathlib
-import pyperclip
 import shutil
 import sys
-
-from typing import Iterable
 from dataclasses import dataclass
 from datetime import datetime
+from typing import Iterable
+
+import click
+import pyperclip
 
 Pathlike = str | pathlib.Path
 
@@ -285,8 +285,7 @@ def sg_mbp_build(dev_version):
         new_folder_path = PATH_WIN_DESKTOP / new_folder_name
         if new_folder_path.exists():
             raise MBPExcecption(f"Folder exists on desktop: {new_folder_name}")
-        else:
-            new_folder_path.mkdir()
+        new_folder_path.mkdir()
 
         copy_workbooks(group, new_folder_path, build_version)
         copy_frms(group, new_folder_path, build_version)
@@ -364,7 +363,7 @@ def create_changelog_entry(cwd: Pathlike, new_version: str) -> None:
     show_default="next minor version",
 )
 def sg_mbp_new_version(version):
-    """
+    r"""
     creates a new version folder, new excel changes files and modifies the overall changelog
     in "E:\Safeguard-MBP-issues"
     """