diff --git a/python_modules/finish_cleanup.py b/python_modules/finish_cleanup.py
index a3be42a0..e0ca2694 100644
--- a/python_modules/finish_cleanup.py
+++ b/python_modules/finish_cleanup.py
@@ -36,67 +36,63 @@ def copy_debian_xfce_based():
         XFCE
     """
     os.chdir(HOME_FOLDER + FUSATO_ROOT)
-    current_working_directory = os.getcwd().replace('/', '/')
+    current_working_directory = os.listdir(".")
     today = str(date.today())
-    for root, dirs, files in os.walk(current_working_directory):
-        for f_v in files:
-            if f_v.endswith('.64xfc'):
-                if f_v.endswith('.iso'):
-                    src_iso = current_working_directory + '/' + f_v
-                    rdes = (current_working_directory +
-                            '/PeppermintOS-Debian_64_xfce'
-                            + today +
-                            '.iso'
-                            )
-                    des_iso = '/var/www/html/nightly/deb64/xfce'
-                    os.rename(src_iso, rdes)
-                    shutil.copy(rdes, des_iso)
-                if f_v.endswith('.checksum'):
-                    src_sum = current_working_directory + '/' + f_v
-                    rdes_sum = (current_working_directory +
-                                '/PeppermintOS-Debian_64-sha512.checksum'
-                                )
-                    des_sum = '/var/www/html/nightly/deb64/xfce'
-                    os.rename(src_sum, rdes_sum)
-                    shutil.copy(rdes_sum, des_sum)
-            elif f_v.endswith('.32xfc'):
-                if f_v.endswith('.iso'):
-                    src_iso = current_working_directory + '/' + f_v
-                    rdes = (current_working_directory +
-                            '/PeppermintOS-Debian_32_xfce'
-                            + today +
-                            '.iso'
-                            )
-                    des_iso = '/var/www/html/nightly/deb32/xfce'
-                    os.rename(src_iso, rdes)
-                    shutil.copy(rdes, des_iso)
-                if f_v.endswith('.checksum'):
-                    src_sum = current_working_directory + '/' + f_v
-                    rdes_sum = (current_working_directory +
-                                '/PeppermintOS-Debian_32-sha512.checksum'
-                                )
-                    des_sum = '/var/www/html/nightly/deb32/xfce'
-                    os.rename(src_sum, rdes_sum)
-                    shutil.copy(rdes_sum, des_sum)
-            elif f_v.endswith('.armxfc'):
-                if f_v.endswith('.iso'):
-                    src_iso = current_working_directory + '/' + f_v
-                    rdes = (current_working_directory +
-                            '/PeppermintOS-Debian_arm_xfce'
-                            + today +
-                            '.iso'
-                            )
-                    des_iso = '/var/www/html/nightly/debarm/xfce'
-                    os.rename(src_iso, rdes)
-                    shutil.copy(rdes, des_iso)
-                if f_v.endswith('.checksum'):
-                    src_sum = current_working_directory + '/' + f_v
-                    rdes_sum = (current_working_directory +
-                                '/PeppermintOS-Debian_arm-sha512.checksum'
-                                )
-                    des_sum = '/var/www/html/nightly/debarm/xfce'
-                    os.rename(src_sum, rdes_sum)
-                    shutil.copy(rdes_sum, des_sum)
+    look_for_file_64 = Path('deb.64xfc')
+    look_for_file_32 = Path('deb.32xfc')
+    look_for_file_arm = Path('deb.armxfc')
+
+    if look_for_file_64.is_file():
+        for f_v in current_working_directory:
+            if f_v.endswith('.iso'):
+                src_iso = f_v
+                rdes = ('PeppermintOS-Debian_64_xfce'
+                        + today +
+                        '.iso'
+                        )
+                des_iso = '/var/www/html/nightly/deb64/xfce'
+                os.rename(src_iso, rdes)
+                shutil.copy(rdes, des_iso)
+            if f_v.endswith('.checksum'):
+                src_sum = f_v
+                rdes_sum = 'PeppermintOS-Debian_64_xfce-sha512.checksum'
+                des_sum = '/var/www/html/nightly/deb64/xfce'
+                os.rename(src_sum, rdes_sum)
+                shutil.copy(rdes_sum, des_sum)
+    elif look_for_file_32.is_file():
+        for f_v in current_working_directory:
+            if f_v.endswith('.iso'):
+                src_iso = f_v
+                rdes = ('PeppermintOS-Debian_32_xfce'
+                        + today +
+                        '.iso'
+                        )
+                des_iso = '/var/www/html/nightly/deb32/xfce'
+                os.rename(src_iso, rdes)
+                shutil.copy(rdes, des_iso)
+            if f_v.endswith('.checksum'):
+                src_sum = f_v
+                rdes_sum = 'PeppermintOS-Debian_32_xfce-sha512.checksum'
+                des_sum = '/var/www/html/nightly/deb32/xfce'
+                os.rename(src_sum, rdes_sum)
+                shutil.copy(rdes_sum, des_sum)
+    elif look_for_file_arm.is_file():
+        for f_v in current_working_directory:
+            if f_v.endswith('.iso'):
+                src_iso = f_v
+                rdes = ('PeppermintOS-Debian_arm_xfce'
+                        + today +
+                        '.iso'
+                        )
+                des_iso = '/var/www/html/nightly/debarm/xfce'
+                os.rename(src_iso, rdes)
+                shutil.copy(rdes, des_iso)
+            if f_v.endswith('.checksum'):
+                src_sum = f_v
+                rdes_sum = 'PeppermintOS-Debian_arma_xfce-sha512.checksum'
+                des_sum = '/var/www/html/nightly/debarm/xfce'
+                os.rename(src_sum, rdes_sum)
+                shutil.copy(rdes_sum, des_sum)
 
 
 def copy_debian_gfb_based():
@@ -104,135 +100,126 @@ def copy_debian_gfb_based():
         Gnome Flashback
     """
     os.chdir(HOME_FOLDER + FUSATO_ROOT)
-    current_working_directory = os.getcwd()
+    current_working_directory = os.listdir(".")
     today = str(date.today())
-    for files in os.walk(current_working_directory):
-        for f_v in files:
-            if f_v.endswith('.64gfb'):
-                if f_v.endswith('.iso'):
-                    src_iso = current_working_directory + '/' + f_v
-                    rdes = (current_working_directory +
-                            '/PeppermintOS-Debian_64_gfb'
-                            + today +
-                            '.iso'
-                            )
-                    des_iso = '/var/www/html/nightly/deb64/gnome-flashback'
-                    os.rename(src_iso, rdes)
-                    shutil.copy(rdes, des_iso)
-                if f_v.endswith('.checksum'):
-                    src_sum = current_working_directory + '/' + f_v
-                    rdes_sum = (current_working_directory +
-                                '/PeppermintOS-Debian_64-sha512.checksum'
-                                )
-                    des_sum = '/var/www/html/nightly/deb64/gnome-flashback'
-                    os.rename(src_sum, rdes_sum)
-                    shutil.copy(rdes_sum, des_sum)
-            elif f_v.endswith('.32gfb'):
-                if f_v.endswith('.iso'):
-                    src_iso = current_working_directory + '/' + f_v
-                    rdes = (current_working_directory +
-                            '/PeppermintOS-Debian_32_gfb'
-                            + today +
-                            '.iso'
-                            )
-                    des_iso = '/var/www/html/nightly/deb32/gnome-flashback'
-                    os.rename(src_iso, rdes)
-                    shutil.copy(rdes, des_iso)
-                if f_v.endswith('.checksum'):
-                    src_sum = current_working_directory + '/' + f_v
-                    rdes_sum = (current_working_directory +
-                                '/PeppermintOS-Debian_32-sha512.checksum'
-                                )
-                    des_sum = '/var/www/html/nightly/deb32/gnome-flashback'
-                    os.rename(src_sum, rdes_sum)
-                    shutil.copy(rdes_sum, des_sum)
-            elif f_v.endswith('.armgfb'):
-                if f_v.endswith('.iso'):
-                    src_iso = current_working_directory + '/' + f_v
-                    rdes = (current_working_directory +
-                            '/PeppermintOS-Debian_arm_gfb'
-                            + today +
-                            '.iso'
-                            )
-                    des_iso = '/var/www/html/nightly/debarm/gnome-flashback'
-                    os.rename(src_iso, rdes)
-                    shutil.copy(rdes, des_iso)
-                if f_v.endswith('.checksum'):
-                    src_sum = current_working_directory + '/' + f_v
-                    rdes_sum = (current_working_directory +
-                                '/PeppermintOS-Debian_arm-sha512.checksum'
-                                )
-                    des_sum = '/var/www/html/nightly/debarm/gnome-flashback'
-                    os.rename(src_sum, rdes_sum)
-                    shutil.copy(rdes_sum, des_sum)
+    look_for_file_64 = Path('deb.64gfb')
+    look_for_file_32 = Path('deb.32gfb')
+    look_for_file_arm = Path('deb.armgfb')
 
+    if look_for_file_64.is_file():
+        for f_v in current_working_directory:
+            if f_v.endswith('.iso'):
+                src_iso = f_v
+                rdes = ('PeppermintOS-Debian_64_gfb'
+                        + today +
+                        '.iso'
+                        )
+                des_iso = '/var/www/html/nightly/deb64/gnome-flashback'
+                os.rename(src_iso, rdes)
+                shutil.copy(rdes, des_iso)
+            if f_v.endswith('.checksum'):
+                src_sum = f_v
+                rdes_sum = 'PeppermintOS-Debian_64_gfb-sha512.checksum'
+                des_sum = '/var/www/html/nightly/deb64/gnome-flashback'
+                os.rename(src_sum, rdes_sum)
+                shutil.copy(rdes_sum, des_sum)
+    elif look_for_file_32.is_file():
+        for f_v in current_working_directory:
+            if f_v.endswith('.iso'):
+                src_iso = f_v
+                rdes = ('PeppermintOS-Debian_32_gfb'
+                        + today +
+                        '.iso'
+                        )
+                des_iso = '/var/www/html/nightly/deb32/gnome-flashback'
+                os.rename(src_iso, rdes)
+                shutil.copy(rdes, des_iso)
+            if f_v.endswith('.checksum'):
+                src_sum = f_v
+                rdes_sum = 'PeppermintOS-Debian_32-sha512.checksum'
+                des_sum = '/var/www/html/nightly/deb32/gnome-flashback'
+                os.rename(src_sum, rdes_sum)
+                shutil.copy(rdes_sum, des_sum)
+    elif look_for_file_arm.is_file():
+        for f_v in current_working_directory:
+            if f_v.endswith('.iso'):
+                src_iso = f_v
+                rdes = ('PeppermintOS-Debian_arm_gfb'
+                        + today +
+                        '.iso'
+                        )
+                des_iso = '/var/www/html/nightly/debarm/gnome-flashback'
+                os.rename(src_iso, rdes)
+                shutil.copy(rdes, des_iso)
+            if f_v.endswith('.checksum'):
+                src_sum = f_v
+                rdes_sum = 'PeppermintOS-Debian_arm_gfb-sha512.checksum'
+                des_sum = '/var/www/html/nightly/debarm/gnome-flashback'
+                os.rename(src_sum, rdes_sum)
+                shutil.copy(rdes_sum, des_sum)
 
 def copy_debian_opb_based():
     """ Copy the new ISO debian base to its Nightly folder
         OpenBox
     """
     os.chdir(HOME_FOLDER + FUSATO_ROOT)
-    current_working_directory = os.getcwd()
+    current_working_directory = os.listdir(".")
     today = str(date.today())
-    for files in os.walk(current_working_directory):
-        for f_v in files:
-            if f_v.endswith('.64opb'):
-                if f_v.endswith('.iso'):
-                    src_iso = current_working_directory + '/' + f_v
-                    rdes = (current_working_directory +
-                            '/PeppermintOS-Debian_64_opb'
-                            + today +
-                            '.iso'
-                            )
-                    des_iso = '/var/www/html/nightly/deb64/openbox'
-                    os.rename(src_iso, rdes)
-                    shutil.copy(rdes, des_iso)
-                if f_v.endswith('.checksum'):
-                    src_sum = current_working_directory + '/' + f_v
-                    rdes_sum = (current_working_directory +
-                                '/PeppermintOS-Debian_64-sha512.checksum'
-                                )
-                    des_sum = '/var/www/html/nightly/deb64/openbox'
-                    os.rename(src_sum, rdes_sum)
-                    shutil.copy(rdes_sum, des_sum)
-            elif f_v.endswith('.32opb'):
-                if f_v.endswith('.iso'):
-                    src_iso = current_working_directory + '/' + f_v
-                    rdes = (current_working_directory +
-                            '/PeppermintOS-Debian_32_opb'
-                            + today +
-                            '.iso'
-                            )
-                    des_iso = '/var/www/html/nightly/deb32/openbox'
-                    os.rename(src_iso, rdes)
-                    shutil.copy(rdes, des_iso)
-                if f_v.endswith('.checksum'):
-                    src_sum = current_working_directory + '/' + f_v
-                    rdes_sum = (current_working_directory +
-                                '/PeppermintOS-Debian_32-sha512.checksum'
-                                )
-                    des_sum = '/var/www/html/nightly/deb32/openbox'
-                    os.rename(src_sum, rdes_sum)
-                    shutil.copy(rdes_sum, des_sum)
-            elif f_v.endswith('.armopb'):
-                if f_v.endswith('.iso'):
-                    src_iso = current_working_directory + '/' + f_v
-                    rdes = (current_working_directory +
-                            '/PeppermintOS-Debian_arm_opb'
-                            + today +
-                            '.iso'
-                            )
-                    des_iso = '/var/www/html/nightly/debarm/openbox'
-                    os.rename(src_iso, rdes)
-                    shutil.copy(rdes, des_iso)
-                if f_v.endswith('.checksum'):
-                    src_sum = current_working_directory + '/' + f_v
-                    rdes_sum = (current_working_directory +
-                                '/PeppermintOS-Debian_arm-sha512.checksum'
-                                )
-                    des_sum = '/var/www/html/nightly/debarm/openbox'
-                    os.rename(src_sum, rdes_sum)
-                    shutil.copy(rdes_sum, des_sum)
+    look_for_file_64 = Path('deb.64opb')
+    look_for_file_32 = Path('deb.32opb')
+    look_for_file_arm = Path('deb.armopb')
+
+    if look_for_file_64.is_file():
+        for f_v in current_working_directory:
+            if f_v.endswith('.iso'):
+                src_iso = f_v
+                rdes = ('PeppermintOS-Debian_64_opb'
+                        + today +
+                        '.iso'
+                        )
+                des_iso = '/var/www/html/nightly/deb64/openbox'
+                os.rename(src_iso, rdes)
+                shutil.copy(rdes, des_iso)
+            if f_v.endswith('.checksum'):
+                src_sum = f_v
+                rdes_sum = 'PeppermintOS-Debian_64_opb-sha512.checksum'
+                des_sum = '/var/www/html/nightly/deb64/openbox'
+                os.rename(src_sum, rdes_sum)
+                shutil.copy(rdes_sum, des_sum)
+    elif look_for_file_32.is_file():
+        for f_v in current_working_directory:
+            if f_v.endswith('.iso'):
+                src_iso = f_v
+                rdes = ('PeppermintOS-Debian_32_opb'
+                        + today +
+                        '.iso'
+                        )
+                des_iso = '/var/www/html/nightly/deb32/openbox'
+                os.rename(src_iso, rdes)
+                shutil.copy(rdes, des_iso)
+            if f_v.endswith('.checksum'):
+                src_sum = f_v
+                rdes_sum = 'PeppermintOS-Debian_32_opb-sha512.checksum'
+                des_sum = '/var/www/html/nightly/deb32/openbox'
+                os.rename(src_sum, rdes_sum)
+                shutil.copy(rdes_sum, des_sum)
+    elif look_for_file_arm.is_file():
+        for f_v in current_working_directory:
+            if f_v.endswith('.iso'):
+                src_iso = f_v
+                rdes = ('PeppermintOS-Debian_arm_opb'
+                        + today +
+                        '.iso'
+                        )
+                des_iso = '/var/www/html/nightly/debarm/openbox'
+                os.rename(src_iso, rdes)
+                shutil.copy(rdes, des_iso)
+            if f_v.endswith('.checksum'):
+                src_sum = f_v
+                rdes_sum = 'PeppermintOS-Debian_arma_opb-sha512.checksum'
+                des_sum = '/var/www/html/nightly/debarm/openbox'
+                os.rename(src_sum, rdes_sum)
+                shutil.copy(rdes_sum, des_sum)
 
 
 def copy_devuan_xfce_based():