diff --git a/nh-core/src/test/java/com/tisawesomeness/namehistorian/testutil/package-info.java b/nh-core/src/test/java/com/tisawesomeness/namehistorian/testutil/package-info.java
deleted file mode 100644
index 09a016a..0000000
--- a/nh-core/src/test/java/com/tisawesomeness/namehistorian/testutil/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-@AllNonnullByDefault
-package com.tisawesomeness.namehistorian.testutil;
-
-import com.tisawesomeness.namehistorian.AllNonnullByDefault;
\ No newline at end of file
diff --git a/nh-spigot/src/main/java/com/tisawesomeness/namehistorian/spigot/HistoryCommand.java b/nh-spigot/src/main/java/com/tisawesomeness/namehistorian/spigot/HistoryCommand.java
index 1290122..aab27f5 100644
--- a/nh-spigot/src/main/java/com/tisawesomeness/namehistorian/spigot/HistoryCommand.java
+++ b/nh-spigot/src/main/java/com/tisawesomeness/namehistorian/spigot/HistoryCommand.java
@@ -23,7 +23,7 @@
 import java.util.stream.Collectors;
 
 @AllArgsConstructor
-public class HistoryCommand implements CommandExecutor, TabCompleter {
+public final class HistoryCommand implements CommandExecutor, TabCompleter {
 
     private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
diff --git a/nh-spigot/src/main/java/com/tisawesomeness/namehistorian/spigot/NameHistorianSpigot.java b/nh-spigot/src/main/java/com/tisawesomeness/namehistorian/spigot/NameHistorianSpigot.java
index bf6850a..0465d1f 100644
--- a/nh-spigot/src/main/java/com/tisawesomeness/namehistorian/spigot/NameHistorianSpigot.java
+++ b/nh-spigot/src/main/java/com/tisawesomeness/namehistorian/spigot/NameHistorianSpigot.java
@@ -58,11 +58,11 @@ public void onDisable() {
 
     private void recordOnlinePlayers() throws SQLException {
         List<NamedPlayer> players = getServer().getOnlinePlayers().stream()
-                .map(this::toNamedPlayer)
+                .map(NameHistorianSpigot::toNamedPlayer)
                 .collect(Collectors.toList());
         getHistorian().recordNames(players);
     }
-    private NamedPlayer toNamedPlayer(Player player) {
+    private static NamedPlayer toNamedPlayer(Player player) {
         return new NamedPlayer(player.getUniqueId(), player.getName());
     }
 
diff --git a/nh-spigot/src/main/java/com/tisawesomeness/namehistorian/spigot/SeenListener.java b/nh-spigot/src/main/java/com/tisawesomeness/namehistorian/spigot/SeenListener.java
index 14503f1..44bd8c7 100644
--- a/nh-spigot/src/main/java/com/tisawesomeness/namehistorian/spigot/SeenListener.java
+++ b/nh-spigot/src/main/java/com/tisawesomeness/namehistorian/spigot/SeenListener.java
@@ -11,7 +11,7 @@
 import java.sql.SQLException;
 
 @AllArgsConstructor
-public class SeenListener implements Listener {
+public final class SeenListener implements Listener {
 
     private final NameHistorianSpigot plugin;