diff --git a/Clear-DriveSpace.psm1 b/Clear-DriveSpace.psm1
index 6e65575..6e7efec 100644
--- a/Clear-DriveSpace.psm1
+++ b/Clear-DriveSpace.psm1
@@ -1,14 +1,13 @@
 function Clear-DriveSpace {
-
-    <#
+<#
 .SYNOPSIS
 Clear-DriveSpace takes a computer name and runs through a set of processes that clears out unused drive space on a local computer.
 
 .DESCRIPTION
-Clear-DriveSpace is a tool that can be run on systems with low drive space. It uses TreeSize after the program is finished executing to display the remaining drive space and what is using up most of it. The tool can only be run on systems where a GUI is installed, due to TreeSize requiring a GUI to view what is utilizing drive space, allowing the user to manually remove remaining files.
+Clear-DriveSpace is a tool that can be run on systems with low drive space. 
 
 .PARAMETER ComputerName
-ComputerName is a required parameter for this script. You can type localhost to run it on the current system or the current hostname.
+ComputerName is a required parameter for this script. 
 
 .EXAMPLE
 Clear-DriveSpace -ComputerName "Shanelaptop"
@@ -20,101 +19,77 @@ Must be running at least PowerShell Version 5.0 - check with $PSVersionTable.
 
     [CmdletBinding()]
     Param (
-        [Parameter(Mandatory = $true, ValueFromPipeline = $true)]
-        [String]$ComputerName
+        [Parameter(Mandatory = $false)]
+        [ValidatePattern("^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$")]
+        [String]$ComputerName = 'localhost'
     )
 
-    Write-Host "Thanks for running my cleanup utility! Let's begin cleaning up disk space."  -ForeGroundColor Black -BackGroundcolor White
-
-    # For loop runs through all computer names, downloads drive cleanup utilities, removes temp files, runs Wicleanup proces
-    if (Test-Connection $ComputerName -Quiet) {
-
-        # Remove temp contents - Recursively delete
-        $Temp = 'C:\Temp'
-        if (Test-Path -Path $Temp) {
-            Set-Location $Temp
+    # Helper function to delete files
+    function Remove-Files {
+        Param (
+            [Parameter(Mandatory=$true)]
+            [String]$Path
+        )
+        if (Test-Path -Path $Path) {
+            Set-Location $Path
             Get-ChildItem * | Remove-Item -Recurse -Force
-            Write-Host "Setting location to Temp directory and clearing all temp files." -ForeGroundColor Black -BackGroundcolor White
+            Write-Host "Clearing $Path." -ForeGroundColor Black -BackGroundcolor White
             Start-Sleep 3
         }
         else {
+            Write-Host "Error: $Path doesn't exist." -ForeGroundColor Black -BackGroundcolor Yellow
             Start-Sleep 3
-            Write-Host "Error: Temp directory doesn't exist." -ForeGroundColor Black -BackGroundcolor Yellow
         }
+    }
 
-        # Remove least cumulative updates contents - Recursively delete
-        $Lcu = 'C:\Windows\servicing\lcu'
-        if (Test-Path -Path $Lcu) {
-            Set-Location $Lcu
-            Get-ChildItem * | Remove-Item -Recurse -Force
-            Write-Host "Setting location to last cumulative update directory and clearing all temp update files." -ForeGroundColor Black -BackGroundcolor White
-            Start-Sleep 3
-        }
-        else {
-            Start-Sleep 3
-            Write-Host "Error: Lcu directory doesn't exist." -ForeGroundColor Black -BackGroundcolor Yellow
-        }
+    # Begin script
+    Write-Host "Thanks for running my cleanup utility! Let's begin cleaning up disk space."  -ForeGroundColor Black -BackGroundcolor White
 
-        # Remove Software Distribution contents - Recursively delete
-        $Swdistro = 'C:\Windows\SoftwareDistribution'
-        if (Test-Path -Path $Swdistro) {
-            Set-Location $Swdistro
-            Get-ChildItem * | Remove-Item -Recurse -Force
-            Write-Host "Setting location to Windows Temp update directory and clearing all temp update files." -ForeGroundColor Black -BackGroundcolor White
-            Start-Sleep 3
-        }
-        else {
-            Start-Sleep 3
-            Write-Host "Error: Software Distribution directory doesn't exist." -ForeGroundColor Black -BackGroundcolor Yellow
-        }
+    # Check connectivity
+    if (!(Test-Connection $ComputerName -Quiet)) {
+        Write-Warning "Error: Cannot connect to $ComputerName. Please verify computer name and network connectivity."  -ForeGroundColor Yellow -BackGroundcolor Black
+        return
+    }
 
-        # Remove Recycle Bin contents - Recursively delete
-        $Recycle = 'C:\$RECYCLE.BIN'
-        if (Test-Path -Path $Recycle) {
-            Set-Location $Recycle
-            Get-ChildItem * | Remove-Item -Recurse -Force
-            Write-Host "Setting location to Recycle Bin directory and permanently removing deleted items." -ForeGroundColor Black -BackGroundcolor White
-            Start-Sleep 3
-        }
-        else {
-            Start-Sleep 3
-            Write-Host "Error: Recycle Bin not enabled." -ForeGroundColor Black -BackGroundcolor Yellow
-        }
+    # Clear temp files
+    $Temp = 'C:\Temp'
+    Remove-Files -Path $Temp
 
-        Write-Host "Downloading drive cleanup utilities." -ForeGroundColor Black -BackGroundcolor White
-
-        # Download Treesize
-        $treesize = 'http://www.jam-software.com/treesize_free/TreeSizeFreeSetup.exe' 
-        $path = "C:\Temp\treesize.exe"
-        Start-BitsTransfer -Source $treesize -Destination $path
-
-        # Download Wicleanup
-        $wicleanupc = "https://fm.solewe.com/vfm-admin/vfm-downloader.php?q=0&sh=98b0a30e8e36652bab02f90771e8128a&share=8564959590d7c06333f81e5b7ee18fc2"
-        $path = "C:\Temp\wicleanup.7z"
-        Start-BitsTransfer -Source $wicleanupc -Destination $path
-
-        # Install 7Zip module to extract Wicleanup
-        Install-Module -Name 7Zip4PowerShell -Force
-        $wicleanupzip = "C:\Temp\wicleanup.7z"
-        Expand-7Zip -ArchiveFileName $wicleanupzip -TargetPath 'C:\Temp\wicleanup'
-
-        Write-Host "Running Wicleanup process - Removing all unused MSP/MSI files - Click OK when complete" -ForeGroundColor Black -BackGroundcolor White
-        Set-Location $Temp'\wicleanup'
-        .\WICleanupC.EXE -s | Out-Null # Running Wicleanup and piping output to Out-Null so PWSH waits until the process finishes
-       
-        Write-Host "Running disk cleanup utility." -ForeGroundColor Black -BackGroundcolor White
-        Start-Process -FilePath "cleanmgr.exe" -ArgumentList "/verylowdisk" -Wait
-        
-        Write-Host "Starting 'Programs and Features menu' - Please manually remove unused programs." -ForeGroundColor Black -BackGroundcolor White
-        Start-Process -FilePath "appwiz.cpl" | Out-Null
-        
-        Write-Host "Starting 'TreeSize' - Please finish exe installation and examine what is consuming remaining drive space." -ForeGroundColor Black -BackGroundcolor White
-        Set-Location "C:\Temp"
-        .\treesize.exe 
-       
-    } # If statement end
-    else {
-        Start-Sleep 3
-        Write-Warning "Error: Cannot connect to $ComputerName. Please verify computer name and network connectivity."  -ForeGroundColor Yellow -BackGroundcolor Black
-    } 
-} # End function 
\ No newline at end of file
+    # Remove least cumulative updates contents
+    $Lcu = 'C:\Windows\servicing\lcu'
+    Remove-Files -Path $Lcu
+
+    # Remove Software Distribution contents
+    $Swdistro = 'C:\Windows\SoftwareDistribution'
+    Remove-Files -Path $Swdistro
+
+    # Remove Recycle Bin contents
+    $Recycle = 'C:\$RECYCLE.BIN'
+    Remove-Files -Path $Recycle
+
+    Write-Host "Downloading drive cleanup utilities." -ForeGroundColor Black -BackGroundcolor White
+    $treesize = 'http://www.jam-software.com/treesize_free/TreeSizeFreeSetup.exe'
+    $path = "$Temp\treesize.exe"
+    Start-BitsTransfer -Source $treesize -Destination $path
+
+    # Download Wicleanup
+    $wicleanupc = "https://fm.solewe.com/vfm-admin/vfm-downloader.php?q=0&sh=98b0a30e8e36652bab02f90771e8128a&share=8564959590d7c06333f81e5b7ee18fc2"
+    $path = "$Temp\wicleanup.7z"
+    Start-BitsTransfer -Source $wicleanupc -Destination $path
+
+    # Install 7Zip module to extract Wicleanup
+    Install-Module -Name 7Zip4PowerShell -Force
+    $wicleanupzip = "$Temp\wicleanup.7z"
+    Expand-7Zip -ArchiveFileName $wicleanupzip -TargetPath "$Temp\wicleanup"
+
+    Write-Host "Running Wicleanup process - Removing all unused MSP/MSI files - Click OK when complete" -ForeGroundColor Black -BackGroundcolor White
+    Set-Location "$Temp\wicleanup"
+    .\WICleanupC.EXE -s | Out-Null # Running Wicleanup and piping output to Out-Null so PWSH waits until the process finishes
+
+    Write-Host "Running disk cleanup utility." -ForeGroundColor Black -BackGroundcolor White
+    Start-Process -FilePath "cleanmgr.exe" -ArgumentList "/verylowdisk" -Wait
+
+    Write-Host "Starting 'Programs and Features menu' - Please manually remove unused programs." -ForeGroundColor Black -BackGroundcolor White
+    Start-Process -FilePath "appwiz.cpl" | Out-Null
+
+    Write-Host "Starting 'TreeSize' - Please finish exe installation and examine what is consuming remaining drive space." -ForeGroundColor Black -