diff --git a/main.lua b/main.lua
index 6905035c..a3915726 100644
--- a/main.lua
+++ b/main.lua
@@ -559,14 +559,13 @@ applySettings()
 
 -- Load replays
 for _,fileName in next,fs.getDirectoryItems('replay') do
-    while fileName:sub(12,12):match("[a-zA-Z]") do
+    if fileName:sub(12,12):match("[a-zA-Z]") then repeat
         local date,mode,version,player,seed,setting,mod
-        local fileData=fs.read('replay/'..fileName)
+        local success,fileData=true,fs.read('replay/'..fileName)
         date,   fileData=STRING.readLine(fileData)date=date:gsub("[a-zA-Z]","")
         mode,   fileData=STRING.readLine(fileData)mode=MODE_UPDATE_MAP[mode] or mode
         version,fileData=STRING.readLine(fileData)
         player, fileData=STRING.readLine(fileData) if player=="Local Player" then player="Stacker" end
-        local success
         success,fileData=pcall(love.data.decompress,'string','zlib',fileData)
         if not success then break end
         seed,   fileData=STRING.readLine(fileData)
@@ -596,8 +595,7 @@ for _,fileName in next,fs.getDirectoryItems('replay') do
             )
         )
         fileName=newName
-        break
-    end
+    until true end
     local rep=DATA.parseReplay('replay/'..fileName)
     table.insert(REPLAY,rep)
 end
diff --git a/parts/player/player.lua b/parts/player/player.lua
index 58dbbfc2..748c72d0 100644
--- a/parts/player/player.lua
+++ b/parts/player/player.lua
@@ -1282,13 +1282,11 @@ function Player:hold_norm(ifpre)
                         break
                     end
                 end
-                if success then
-                    break
-                end
+                if success then break end
             end
             if not success then -- All test failed, interrupt with sound
                 SFX.play('drop_cancel')
-                do return end
+                return
             end
 
             self.spinLast=false
@@ -1353,13 +1351,11 @@ function Player:hold_swap(ifpre)
                             break
                         end
                     end
-                    if success then
-                        break
-                    end
+                    if success then break end
                 end
             if not success then -- All test failed, interrupt with sound
                 SFX.play('finesseError')
-                do return end
+                return
             end
 
             self.spinLast=false