Do a bit more cleanup, and shuffle a few things around

src/main/java/com/drtshock/playervaults/tasks/Cleanup.java

@@ -6,7 +6,6 @@ import org.bukkit.scheduler.BukkitRunnable;
 import java.io.File;
 
 public class Cleanup extends BukkitRunnable {
-
     private long diff;
 
     public Cleanup(int diff) {
@@ -15,14 +14,17 @@ public class Cleanup extends BukkitRunnable {
 
     @Override
     public void run() {
-        File file = PlayerVaults.getInstance().getVaultData();
-        if (!file.exists()) return;
+        File directory = PlayerVaults.getInstance().getVaultData();
+        if (!directory.exists()) {
+            // folder doesn't exist, don't run
+            return;
+        }
 
         long time = System.currentTimeMillis();
-        for (File f : file.listFiles()) {
-            if (time - f.lastModified() > diff) {
-                f.delete();
-                PlayerVaults.getInstance().getLogger().info("Deleting vault file: " + f.getName());
+        for (File file : directory.listFiles()) {
+            if (time - file.lastModified() > diff) {
+                PlayerVaults.getInstance().getLogger().info("Deleting vault file (cleanup): " + file.getName());
+                file.delete();
             }
         }
     }

src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java

@@ -8,14 +8,12 @@ import org.bukkit.scheduler.BukkitRunnable;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.UUID;
 import java.util.logging.Level;
 
 /**
  * Class to convert vaults by name to vaults by UUID.
  */
 public final class UUIDConversion extends BukkitRunnable {
-
     @Override
     public void run() {
         File newDir = PlayerVaults.getInstance().getVaultData();
@@ -23,11 +21,12 @@ public final class UUIDConversion extends BukkitRunnable {
             PlayerVaults.getInstance().getLogger().log(Level.INFO, "Files already converted to UUID.");
             return;
         }
+
         newDir.mkdirs();
 
         PlayerVaults.getInstance().getLogger().log(Level.INFO, "********** Starting PlayerVault conversion to UUIDs **********");
         PlayerVaults.getInstance().getLogger().log(Level.INFO, "This might take awhile.");
-        PlayerVaults.getInstance().getLogger().log(Level.INFO, "plugins/PlayerVaults/vaults will still be there as a backup but unused.");
+        PlayerVaults.getInstance().getLogger().log(Level.INFO, "plugins/PlayerVaults/vaults will remain as a backup.");
 
         for (File file : new File(PlayerVaults.getInstance().getDataFolder() + File.separator + "vaults").listFiles()) {
             if (file.isDirectory()) continue; // backups folder.
@@ -37,8 +36,7 @@ public final class UUIDConversion extends BukkitRunnable {
                 break;
             }
 
-            UUID uuid = player.getUniqueId();
-            File newFile = new File(PlayerVaults.getInstance().getVaultData(), uuid.toString() + ".yml");
+            File newFile = new File(PlayerVaults.getInstance().getVaultData(), player.getUniqueId().toString() + ".yml");
             file.mkdirs();
             try {
                 Files.copy(file, newFile);