diff --git a/src/lib/installation/clients/umount_finish.rb b/src/lib/installation/clients/umount_finish.rb
index e9e8453ee..28f5ee862 100644
--- a/src/lib/installation/clients/umount_finish.rb
+++ b/src/lib/installation/clients/umount_finish.rb
@@ -126,13 +126,11 @@ def main
         # /proc
 
         @umount_these = ["/proc", "/sys", "/dev", "/run"]
-        if Hotplug.haveUSB
-          @umount_these.unshift(USB_PATH)
-        end
 
-        if File.exist?(EFIVARS_PATH) #exists in both inst-sys and target or in neither
-          @umount_these.unshift(EFIVARS_PATH)
-        end
+        @umount_these.unshift(USB_PATH) if Hotplug.haveUSB
+
+        # exists in both inst-sys and target or in neither
+        @umount_these.unshift(EFIVARS_PATH) if File.exist?(EFIVARS_PATH) 
 
         Builtins.foreach(@umount_these) do |umount_dir|
           umount_this = Builtins.sformat(