diff --git a/winPEAS/winPEASexe/winPEAS/Checks/Checks.cs b/winPEAS/winPEASexe/winPEAS/Checks/Checks.cs
index 667600e..a6d1770 100644
--- a/winPEAS/winPEASexe/winPEAS/Checks/Checks.cs
+++ b/winPEAS/winPEASexe/winPEAS/Checks/Checks.cs
@@ -157,12 +157,17 @@ namespace winPEAS.Checks
                         CheckRegANSI();
                     }
 
-                    CheckRunner.Run(CreateDynamicLists, IsDebug);
+                    Beaprint.PrintInit();
 
-                    Beaprint.PrintInit(IsDebug);
+                    CheckRunner.Run(CreateDynamicLists, IsDebug);
 
                     RunChecks(isAllChecks, wait);
                 }, IsDebug, "Total time");
+
+                if (IsDebug)
+                {
+                    MemoryHelper.DisplayMemoryStats();
+                }
             }
             finally
             {
diff --git a/winPEAS/winPEASexe/winPEAS/Checks/WindowsCreds.cs b/winPEAS/winPEASexe/winPEAS/Checks/WindowsCreds.cs
index ff0932b..4e421c7 100644
--- a/winPEAS/winPEASexe/winPEAS/Checks/WindowsCreds.cs
+++ b/winPEAS/winPEASexe/winPEAS/Checks/WindowsCreds.cs
@@ -282,9 +282,6 @@ namespace winPEAS.Checks
                             }
                         }
                     }
-                    //Beaprint.GrayPrint("    This function is not yet implemented.");
-                    //Beaprint.InfoPrint("If you want to list saved Wifis connections you can list the using 'netsh wlan show profile'");
-                    //Beaprint.InfoPrint("If you want to get the clear-text password use 'netsh wlan show profile <SSID> key=clear'");
                 }
             }
             catch (Exception ex)
diff --git a/winPEAS/winPEASexe/winPEAS/Helpers/Beaprint.cs b/winPEAS/winPEASexe/winPEAS/Helpers/Beaprint.cs
index bcbb2b3..58c4bc6 100644
--- a/winPEAS/winPEASexe/winPEAS/Helpers/Beaprint.cs
+++ b/winPEAS/winPEASexe/winPEAS/Helpers/Beaprint.cs
@@ -77,7 +77,7 @@ namespace winPEAS.Helpers
                 Thread.Sleep(700);
         }
 
-        public static void PrintInit(bool isDebug)
+        public static void PrintInit()
         {
             if (Checks.Checks.Banner)
             {
@@ -87,11 +87,6 @@ namespace winPEAS.Helpers
             Console.WriteLine(YELLOW + "  WinPEAS " + GREEN + Version + NOCOLOR + YELLOW + " by carlospolop, makikvues(sergi.chamila@gmail.com)" + NOCOLOR);
             Console.WriteLine();
 
-            if (isDebug)
-            {
-                MemoryHelper.DisplayMemoryStats();
-            }
-
             PrintLegend();
             Console.WriteLine();
             LinkPrint("https://book.hacktricks.xyz/windows/checklist-windows-privilege-escalation", "You can find a Windows local PE Checklist here:");
diff --git a/winPEAS/winPEASexe/winPEAS/Helpers/CustomFileInfo.cs b/winPEAS/winPEASexe/winPEAS/Helpers/CustomFileInfo.cs
index 05858f9..165780f 100644
--- a/winPEAS/winPEASexe/winPEAS/Helpers/CustomFileInfo.cs
+++ b/winPEAS/winPEASexe/winPEAS/Helpers/CustomFileInfo.cs
@@ -5,6 +5,7 @@
         public string Filename { get; set; }
         public string Extension { get; set; }
         public string FullPath { get; set; }
+        public bool IsDirectory { get { return string.IsNullOrEmpty(Filename); } }
 
         public CustomFileInfo(string filename, string extension, string fullPath)
         {
diff --git a/winPEAS/winPEASexe/winPEAS/Helpers/Search/SearchHelper.cs b/winPEAS/winPEASexe/winPEAS/Helpers/Search/SearchHelper.cs
index 528ee56..28e7de0 100644
--- a/winPEAS/winPEASexe/winPEAS/Helpers/Search/SearchHelper.cs
+++ b/winPEAS/winPEASexe/winPEAS/Helpers/Search/SearchHelper.cs
@@ -203,9 +203,8 @@ namespace winPEAS.Helpers.Search
             SearchHelper.GroupPolicyHistory.AddRange(groupPolicyHistoryLegacyFiles);
         }
 
-        internal static List<CustomFileInfo> SearchUserCredsFiles()
+        internal static IEnumerable<CustomFileInfo> SearchUserCredsFiles()
         {
-            var result = new List<CustomFileInfo>();
             var patterns = new List<string>
             {
                 ".*credential.*",
@@ -215,21 +214,24 @@ namespace winPEAS.Helpers.Search
             foreach (var file in SearchHelper.RootDirUsers)
             {                
                 //string extLower = file.Extension.ToLower();
-                string nameLower = file.Filename.ToLower();
-                //  string nameExtLower = nameLower + "." + extLower;
 
-                foreach (var pattern in patterns)
+                if (!file.IsDirectory)
                 {
-                    if (Regex.IsMatch(nameLower, pattern, RegexOptions.IgnoreCase))
-                    {
-                        result.Add(new CustomFileInfo(file.Filename, file.Extension, file.FullPath));
+                    string nameLower = file.Filename.ToLower();
+                    //  string nameExtLower = nameLower + "." + extLower;
 
-                        break;
+                    foreach (var pattern in patterns)
+                    {
+                        if (Regex.IsMatch(nameLower, pattern, RegexOptions.IgnoreCase))
+                        {
+                            yield return file;
+
+                            break;
+                        }
                     }
+
                 }
             }
-
-            return result;
         }
 
         internal static List<string> SearchUsersInterestingFiles()
@@ -294,7 +296,7 @@ namespace winPEAS.Helpers.Search
                 "sitelist.xml"
             };
 
-            var searchFiles = new List<CustomFileInfo>();            
+            var searchFiles = new List<CustomFileInfo>();
             searchFiles.AddRange(SearchHelper.ProgramFiles);
             searchFiles.AddRange(SearchHelper.ProgramFilesX86);
             searchFiles.AddRange(SearchHelper.DocumentsAndSettings);