diff --git a/src/main/java/com/dostalgia/FileUtils.java b/src/main/java/com/dostalgia/FileUtils.java
index 3779b5a..af3c7f0 100644
--- a/src/main/java/com/dostalgia/FileUtils.java
+++ b/src/main/java/com/dostalgia/FileUtils.java
@@ -1,7 +1,12 @@
 package com.dostalgia;
 
+import jakarta.annotation.Nonnull;
+
 import java.io.IOException;
-import java.nio.file.*;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 
 /** Shared file-system utilities. */
@@ -13,13 +18,13 @@ public final class FileUtils {
         if (!Files.exists(dir)) return;
         Files.walkFileTree(dir, new SimpleFileVisitor<>() {
             @Override
-            public FileVisitResult visitFile(final Path f, final BasicFileAttributes a) throws IOException {
+            public @Nonnull FileVisitResult visitFile(@Nonnull final Path f, @Nonnull final BasicFileAttributes a) throws IOException {
                 Files.delete(f);
                 return FileVisitResult.CONTINUE;
             }
 
             @Override
-            public FileVisitResult postVisitDirectory(final Path d, final IOException e) throws IOException {
+            public @Nonnull FileVisitResult postVisitDirectory(@Nonnull final Path d, final IOException e) throws IOException {
                 Files.delete(d);
                 return FileVisitResult.CONTINUE;
             }
diff --git a/src/main/java/com/dostalgia/GameController.java b/src/main/java/com/dostalgia/GameController.java
index eb1080c..302dd99 100644
--- a/src/main/java/com/dostalgia/GameController.java
+++ b/src/main/java/com/dostalgia/GameController.java
@@ -15,7 +15,7 @@ import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.StreamingOutput;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Files;
-import java.util.*;
+import java.util.Map;
 
 @Path("/api/games")
 @Produces(MediaType.APPLICATION_JSON)
diff --git a/src/main/java/com/dostalgia/GameService.java b/src/main/java/com/dostalgia/GameService.java
index 5561f71..4c3895c 100644
--- a/src/main/java/com/dostalgia/GameService.java
+++ b/src/main/java/com/dostalgia/GameService.java
@@ -20,7 +20,6 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import jakarta.annotation.Nonnull;
 
 /** Manages game metadata stored as JSON files on disk. */
 @ApplicationScoped
diff --git a/src/main/java/com/dostalgia/IgdbService.java b/src/main/java/com/dostalgia/IgdbService.java
index 1e7dc9a..add57dc 100644
--- a/src/main/java/com/dostalgia/IgdbService.java
+++ b/src/main/java/com/dostalgia/IgdbService.java
@@ -12,7 +12,12 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.file.Path;
 import java.time.Instant;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.logging.Logger;
 
 /** Client for the IGDB (Internet Game Database) API via Twitch OAuth2. */
@@ -94,8 +99,6 @@ public class IgdbService {
         return results.isArray() ? results : null;
     }
 
-    // ─── Search ───────────────────────────────────────────────────
-
     public List<Map<String, Object>> search(String query) throws Exception {
         if (!isConfigured()) return List.of();
 
@@ -199,8 +202,6 @@ public class IgdbService {
         return screenshots;
     }
 
-    // ─── Auto-Scrape ──────────────────────────────────────────────
-
     public void autoScrape(Game game) {
         if (!isConfigured()) return;
         try {
@@ -283,8 +284,6 @@ public class IgdbService {
         }
     }
 
-    // ─── Utility ──────────────────────────────────────────────────
-
     /** Convert IGDB epoch (seconds) to year, from 'first_release_date' field. */
     private static Optional<Integer> epochToYear(JsonNode node) {
         if (node.has("first_release_date")) {