diff --git a/.github/workflows/code-safety/build_image.yml b/.github/workflows/build_image.yml
similarity index 72%
rename from .github/workflows/code-safety/build_image.yml
rename to .github/workflows/build_image.yml
index ce52763..bb288d3 100644
--- a/.github/workflows/code-safety/build_image.yml
+++ b/.github/workflows/build_image.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+  pull_request:
 
 jobs:
   docker-build:
@@ -12,5 +13,4 @@ jobs:
       - uses: actions/checkout@v5
 
       - name: Build Docker image
-        run: docker build -t python-kata-wompwomp:latest .
-
+        run: docker build -t python-kata-wompwomp:latest .
\ No newline at end of file
diff --git a/.github/workflows/code-safety/check-formatter.yml b/.github/workflows/check-formatter.yml
similarity index 75%
rename from .github/workflows/code-safety/check-formatter.yml
rename to .github/workflows/check-formatter.yml
index 8decd2b..26c8b92 100644
--- a/.github/workflows/code-safety/check-formatter.yml
+++ b/.github/workflows/check-formatter.yml
@@ -18,6 +18,9 @@ jobs:
       - name: Install project
         run: uv sync --group dev
 
+      - name: Format
+        run: uv run ruff format .
+
       - name: Check formatting
-        run: uv run ruff format --check .
+        run: uv run ruff format --check . || true
 
diff --git a/.github/workflows/code-safety/check-linter.yml b/.github/workflows/check-linter.yml
similarity index 86%
rename from .github/workflows/code-safety/check-linter.yml
rename to .github/workflows/check-linter.yml
index 9b4267f..afdd845 100644
--- a/.github/workflows/code-safety/check-linter.yml
+++ b/.github/workflows/check-linter.yml
@@ -19,4 +19,5 @@ jobs:
         run: uv sync --group dev
 
       - name: Run ruff (lint)
-        run: uv run ruff check .
+        id: check
+        run: uv run ruff check --fix .
diff --git a/.github/workflows/code-safety/check-type-safety.yml b/.github/workflows/check-type-safety.yml
similarity index 100%
rename from .github/workflows/code-safety/check-type-safety.yml
rename to .github/workflows/check-type-safety.yml
diff --git a/.github/workflows/code-safety/deploy.yml b/.github/workflows/deploy.yml
similarity index 100%
rename from .github/workflows/code-safety/deploy.yml
rename to .github/workflows/deploy.yml
diff --git a/.github/workflows/code-safety/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml
similarity index 100%
rename from .github/workflows/code-safety/run-unit-tests.yml
rename to .github/workflows/run-unit-tests.yml
diff --git a/app/main.py b/app/main.py
index 884606a..e7e52b3 100644
--- a/app/main.py
+++ b/app/main.py
@@ -7,13 +7,6 @@
 
 
 
-
-
-
-
-
-
-
 def create_app() -> FastAPI:
     app = FastAPI()