diff --git a/cleanW10.ps1 b/cleanW10.ps1
index c5234a7..20e66c8 100755
--- a/cleanW10.ps1
+++ b/cleanW10.ps1
@@ -18,91 +18,91 @@ $ProgressPreference = "SilentlyContinue"
 #Thanks to https://gist.github.com/markembling/173887
 function BlockHost {
     param(
-            [Parameter(
-                ValueFromPipeline=$False,
-                ParameterSetName="params",
-                Position = 0
-                )]
-            [object]$params
-         )
-        if ( $params.ContainsKey('file') ) {
-            if ( -not $params.ContainsKey('firewall') -or $params.firewall -eq "" ) {
-                $params.firewall = $false
-            }
-            Get-Content $params.file | where { $_ -notmatch "^#.*$|^$" } | Foreach{ BlockHost -params @{host=$_;firewall=$params.firewall} }
+        [Parameter(
+            ValueFromPipeline=$False,
+            ParameterSetName="params",
+            Position = 0
+            )]
+        [object]$params
+    )
+    if ( $params.ContainsKey('file') ) {
+        if ( -not $params.ContainsKey('firewall') -or $params.firewall -eq "" ) {
+            $params.firewall = $false
         }
+        Get-Content $params.file | where { $_ -notmatch "^#.*$|^$" } | Foreach{ BlockHost -params @{host=$_;firewall=$params.firewall} }
+    }
     elseif ( $params.ContainsKey('host') -and $params.host -ne "" ) {
         Write-Host "`n`tBlock host $($params.host) : "
-            try {
-                if ( $(IsHostAlreadyBlocked $HOST_FILE $params.host) ){
-#If host is inhosts.conf, verify that ip is blocked in FW
-                    if ( $params.ContainsKey('firewall') -and $params.firewall -eq $true ) {
-                        $tmp = Get-Content $HOST_FILE | Where { $_ -ne "$HOST_IP`t`t$($params.host)" }
-                        Set-Content $HOST_FILE $tmp
-                            BlockHostByIP $params.host
-                            $HOST_IP + "`t`t" + $params.host | Out-File -encoding ASCII -append $HOST_FILE
-                    }
-                    Write-Host -ForegroundColor Yellow "`t`tHost Already blocked"
-                }
-                else {
-                    if ( $params.ContainsKey('firewall') -and $params.firewall -eq $true ) {
+        try {
+            if ( $(IsHostAlreadyBlocked $HOST_FILE $params.host) ){
+                #If host is in hosts.conf, verify that ip is blocked in FW
+                if ( $params.ContainsKey('firewall') -and $params.firewall -eq $true ) {
+                    $tmp = Get-Content $HOST_FILE | Where { $_ -ne "$HOST_IP`t`t$($params.host)" }
+                    Set-Content $HOST_FILE $tmp
                         BlockHostByIP $params.host
-                    }
-                    $HOST_IP + "`t`t" + $params.host | Out-File -encoding ASCII -append $HOST_FILE
-                        Write-Host -ForegroundColor Green "`t`tHost blocked"
+                        $HOST_IP + "`t`t" + $params.host | Out-File -encoding ASCII -append $HOST_FILE
                 }
+                Write-Host -ForegroundColor Yellow "`t`tHost Already blocked"
             }
+            else {
+                if ( $params.ContainsKey('firewall') -and $params.firewall -eq $true ) {
+                    BlockHostByIP $params.host
+                }
+                $HOST_IP + "`t`t" + $params.host | Out-File -encoding ASCII -append $HOST_FILE
+                Write-Host -ForegroundColor Green "`t`tHost blocked"
+            }
+        }
         catch {
-            Write-Host -NoNewline -ForegroundColor Red "`t`terror`n`t`t"
-                Write-Host -ForegroundColor DarkRed $Error[0].Exception.Message
+            Write-Host -ForegroundColor Red "`t`tError"
+            Write-Debug $Error[0].Exception.Message
         }
     }
-        else {
-            Write-Host -ForegroundColor Red "`tError : No name or file for action $($MyInvocation.MyCommand.Name)"
-        }
+    else {
+        Write-Host -ForegroundColor Red "`tError : No name or file for action $($MyInvocation.MyCommand.Name)"
+    }
 }
 
 function BlockHostByIP {
     param(
-            [string]$hostname
-         )
-        #$resolv = [system.net.Dns]::GetHostAddresses($hostname) | Select IPAddressToString
-        $resolv = Resolve-DnsName $hostname -ErrorAction SilentlyContinue | Where { $_.type -match "^A{1,4}$" } | select Address
-        $resolv | Foreach {
-            Write-Host -NoNewLine "`t"
-                $ip = $_.Address
-                Write-Debug "Found a valid IP $ip"
-                $rule = Get-NetFirewallAddressFilter | Where-Object { $_.RemoteAddress -eq  $ip } | Get-NetFirewallRule
-                if ( $rule ) {
-                    write-host -NoNewLine "`tFW Rule exist : "
-                        write-host -ForegroundColor yellow $rule.name
-                }
-                else {
-                    FwBlockOutputIP @{
-                        ip=$ip;
-                        name="H_$hostname"
-                    }
-                }
+        [string]$hostname
+    )
+    #$resolv = [system.net.Dns]::GetHostAddresses($hostname) | Select IPAddressToString
+    $resolv = Resolve-DnsName $hostname -ErrorAction SilentlyContinue | Where { $_.type -match "^A{1,4}$" } | select Address
+    $resolv | Foreach {
+        Write-Host -NoNewLine "`t"
+        $ip = $_.Address
+        Write-Debug "Found a valid IP $ip"
+        $rule = Get-NetFirewallAddressFilter | Where-Object { $_.RemoteAddress -eq  $ip } | Get-NetFirewallRule
+        if ( $rule ) {
+            Write-Host -NoNewLine " exist "
+            Write-Host -ForegroundColor yellow $rule.name
         }
+        else {
+            FwBlockOutputIP @{
+                ip=$ip;
+                name="H_$hostname"
+            }
+        }
+    }
 }
 
 function IsHostAlreadyBlocked {
     param([string]$filename, [string]$hostname)
-        $c = Get-Content $filename | where { $_ -eq "$HOST_IP`t`t$hostname" }
+    $c = Get-Content $filename | where { $_ -eq "$HOST_IP`t`t$hostname" }
     Write-Debug "`tMatch hostname on host file : $c"
-        if ( $c ) {
-            return $true
-        }
+    if ( $c ) {
+        return $true
+    }
     return $false
 }
 
 function FwBlockOutputIP {
     param(
-            [object]$params
-         )
-        if ( $params.ContainsKey('file') ) {
-            Get-Content $params.file | where { $_ -notmatch "^#.*$|^$" } | Foreach { FwBlockOutputIP @{ip=$_} }
-        }
+        [object]$params
+    )
+    if ( $params.ContainsKey('file') ) {
+        Get-Content $params.file | where { $_ -notmatch "^#.*$|^$" } | Foreach { FwBlockOutputIP @{ip=$_} }
+    }
     elseif ( $params.ContainsKey('ip') ) {
         if (-not $params.ContainsKey('name') -or $params.name -eq "" ) {
             $name = $FW_RULE_NAME_PREFIX + "_IP_" + $params.ip
@@ -113,18 +113,18 @@ function FwBlockOutputIP {
         Write-Host -NoNewline "`tAdd FW IP rule $name ($($params.ip)) : "
         $rule = Get-NetFirewallAddressFilter | Where-Object { $_.RemoteAddress -eq  $params.ip } | Get-NetFirewallRule
         if ( $rule ) {
-            write-host -NoNewLine " exist : "
-                write-host -ForegroundColor yellow $rule.name
+            Write-Host -NoNewLine " exist "
+            Write-Host -ForegroundColor yellow $rule.name
         }
         else {
             Try {
                 New-NetFirewallRule -Name "$name" -DisplayName "$name" -Direction Outbound -Protocol any -Enabled True -Profile Any -RemoteAddress $params.ip -Action Block | Out-Null
+                Write-Host -ForegroundColor Green "Done"
             }
             Catch {
-                Write-Host -ForegroundColor Red "error"
-                    return
+                Write-Host -ForegroundColor Red "Error"
+                Write-Debug $Error[0].Exception.Message
             }
-            Write-Host -ForegroundColor Green "done"
         }
     }
     else {
@@ -134,40 +134,41 @@ function FwBlockOutputIP {
 
 function FwBlockProgram {
     param (
-            [cmdletbinding(
-                DefaultParameterSetName='params'
-                )]
-            [Parameter(
-                ValueFromPipeline=$False,
-                ParameterSetName="params",
-                Position = 0
-                )]
-            [object]$params
-          )
-        if ( $params.ContainsKey('file') ) {
-            Get-Content $params.file | where { $_ -notmatch "^#.*$|^$" } | Foreach { FwBlockProgram @{path=$_} }
-        }
+        [cmdletbinding(
+            DefaultParameterSetName='params'
+            )]
+        [Parameter(
+            ValueFromPipeline=$False,
+            ParameterSetName="params",
+            Position = 0
+            )]
+        [object]$params
+    )
+    if ( $params.ContainsKey('file') ) {
+        Get-Content $params.file | where { $_ -notmatch "^#.*$|^$" } | Foreach { FwBlockProgram @{path=$_} }
+    }
     elseif ( $params.ContainsKey('path') ) {
         $path = Invoke-Expression """$($params.path)"""
-            if ( -not $params.ContainsKey('name') -or $params.name -eq "" ) {
-                $name = $FW_RULE_NAME_PREFIX + "_PROG_" + $params.path
-            }
+        if ( -not $params.ContainsKey('name') -or $params.name -eq "" ) {
+            $name = $FW_RULE_NAME_PREFIX + "_PROG_" + $params.path
+        }
         $name = $FW_RULE_NAME_PREFIX + "_PROG_" + $params.name
-            Write-Host -NoNewline "`tAdd FW program rule $name ($($path)) : "
-            if ( Get-NetFirewallRule -Name $name -ErrorAction SilentlyContinue) {
-                Write-Host -ForegroundColor Yellow "already exist"
-                    return
-            }
+        Write-Host -NoNewline "`tAdd FW program rule $name ($($path)) : "
+        if ( Get-NetFirewallRule -Name $name -ErrorAction SilentlyContinue) {
+            Write-Host -ForegroundColor Yellow "already exist"
+             return
+        }
         if ( -not (Test-Path $path) ) {
             Write-Host -Foregroundcolor Red "Error (path not found)"
-                return
+            return
         }
         try {
             New-NetFirewallRule -Name "$name" -DisplayName "$name (program : $($params.path))" -Program "$path" -Direction Outbound -Protocol any -Enabled True -Profile Any -RemoteAddress any -Action Block | Out-Null
-                Write-Host -ForegroundColor Green "done"
+            Write-Host -ForegroundColor Green "done"
         }
         catch {
             Write-Host -ForegroundColor Red "error"
+            Write-Debug $Error[0].Exception.Message
         }
     }
     else {
@@ -177,37 +178,37 @@ function FwBlockProgram {
 
 function RemoveScheduledTask () {
     param (
-            [cmdletbinding(
-                DefaultParameterSetName='params'
-                )]
-            [Parameter(
-                ValueFromPipeline=$False,
-                ParameterSetName="params",
-                Position = 0
-                )]
-            [object]$params
-          )
-        if ( $params.ContainsKey('file') ) {
-            Get-Content $params.file | where { $_ -notmatch "^#.*$|^$" } | foreach { RemoveScheduledTask @{name=$_} }
-        }
+        [cmdletbinding(
+            DefaultParameterSetName='params'
+            )]
+        [Parameter(
+            ValueFromPipeline=$False,
+            ParameterSetName="params",
+            Position = 0
+            )]
+        [object]$params
+    )
+    if ( $params.ContainsKey('file') ) {
+        Get-Content $params.file | where { $_ -notmatch "^#.*$|^$" } | foreach { RemoveScheduledTask @{name=$_} }
+    }
     elseif ( $params.ContainsKey('name') ) {
         $command = "Get-ScheduledTask -ErrorAction Stop -TaskName `"$($params.name)`""
-            if ($params.ContainsKey('path') -and $params.path -ne '') {
-                $command += " -TaskPath `"$($params.path)`""
-            }
-            else { $params.path="" }
+        if ($params.ContainsKey('path') -and $params.path -ne '') {
+            $command += " -TaskPath `"$($params.path)`""
+        }
+        else { $params.path="" }
         try {
             $task = Invoke-Expression $command
-                Write-Host -NoNewline "`tRemove task $($params.name) : "
-                $task | Unregister-ScheduledTask -ErrorAction SilentlyContinue -Confirm:$false
-                Write-Host -ForegroundColor Green "done"
+            Write-Host -NoNewline "`tRemove task $($params.name) : "
+            $task | Unregister-ScheduledTask -ErrorAction SilentlyContinue -Confirm:$false
+            Write-Host -ForegroundColor Green "done"
         }
         catch [Microsoft.PowerShell.Cmdletization.Cim.CimJobException]{
             Write-Host -ForegroundColor Yellow "`tScheduled Task $($params.path)$($params.name) not found"
         }
         catch {
-            Write-Host -NoNewLine -ForegroundColor Red "`tError in RemoveSheduledTask`n`t"
-                Write-Host -ForegroundColor DarkRed $Error[0].Exception.Message
+            Write-Host -NoNewLine -ForegroundColor Red "`tError in RemoveSheduledTask"
+            Write-Debug $Error[0].Exception.Message
         }
     }
     else {
@@ -217,12 +218,12 @@ function RemoveScheduledTask () {
 
 function AddRegKey {
     param(
-            [Parameter(Mandatory=$true)]
-            [object]$params
-         )
+        [Parameter(Mandatory=$true)]
+        [object]$params
+     )
     if ( -not $params.ContainsKey('path') -or -not $params.ContainsKey('key') ) {
         Write-Host -ForegroundColor Red -NoNewline "Error in AddRegKey : no path, key or value`n"
-            return
+        return
     }
     if ( -not $params.ContainsKey('value') ) {
         $params.value = $null
@@ -258,8 +259,8 @@ function AddRegKey {
             New-Item -Path $params.path -Force | Out-Null
         }
         catch {
-            Write-Host -NoNewLine -ForegroundColor Red "Error`n`t"
-            Write-Host -ForegroundColor DarkRed $Error[0].Exception.Message
+            Write-Host -NoNewLine -ForegroundColor Red "Error"
+            Write-Debug $Error[0].Exception.Message
             return
         }
     }
@@ -287,16 +288,16 @@ function AddRegKey {
         Write-Host -ForegroundColor Red "Error (access denied)"
     }
     catch {
-        Write-Host -NoNewLine -ForegroundColor Red "`tError`n`t"
-        Write-Host -ForegroundColor DarkRed $Error[0].Exception.Message
+        Write-Host -NoNewLine -ForegroundColor Red "Error"
+        Write-Debug $Error[0].Exception.Message
     }
 }
 
 function DelRegKey {
     param(
-            [Parameter(Mandatory=$true)]
-            [object]$params
-         )
+        [Parameter(Mandatory=$true)]
+        [object]$params
+    )
     #When keypath start with HKCU, we need to apply it ro all users
     if ( ($params.path).StartsWith("HKCU") ) {
         $script:users | Foreach {
@@ -315,7 +316,7 @@ function DelRegKey {
     }
     Write-Host -NoNewline "`tDelete registery key $($params.key) : "
     if ( ! (Test-Path $params.path) ){
-        Write-Host -ForegroundColor Red " Error (path not found)"
+        Write-Host -ForegroundColor Red "Error (path not found)"
         return
     }
     try {
@@ -333,44 +334,45 @@ function DelRegKey {
         Write-Host -ForegroundColor Red "Error (access denied)"
     }
     catch {
-        Write-Host -ForegroundColor Red -NoNewLine "Error`n`t"
-        Write-Host -ForegroundColor DarkRed $Error[0].Exception.Message
+        Write-Host -ForegroundColor Red -NoNewLine "Error"
+        Write-Debug $Error[0].Exception.Message
     }
 }
 
 function DisableFeature {
     param (
-            [cmdletbinding(
-                DefaultParameterSetName='params'
-                )]
-            [Parameter(
-                ValueFromPipeline=$False,
-                ParameterSetName="params",
-                Position = 0
-                )]
-            [object]$params
-          )
+        [cmdletbinding(
+            DefaultParameterSetName='params'
+            )]
+        [Parameter(
+            ValueFromPipeline=$False,
+            ParameterSetName="params",
+            Position = 0
+            )]
+        [object]$params
+    )
     if ( $params.ContainsKey('file') ) {
         Get-Content $params.file | where { $_ -notmatch "^#.*$|^$" } | foreach { DisableFeature @{name=$_} }
     }
     elseif ( $params.ContainsKey('name') ) {
         $feature = $(dism /online /Get-FeatureInfo /FeatureName:$($params.name) /English)
-            $name =  $feature | Select-String "Feature Name" | %{($_ -split " : ")[1]}
+        $name =  $feature | Select-String "Feature Name" | %{($_ -split " : ")[1]}
         if (-not $name){
             Write-Host -ForegroundColor Yellow "`tFeature $params.name not found"
-                return
+            return
         }
         Write-Host -NoNewline  "`tDisable Feature $name : "
-            if ( $($feature | Select-String "state") -match "Disable" ){
-                Write-Host -ForegroundColor Yellow "already disable"
-                    return
-            }
+        if ( $($feature | Select-String "state") -match "Disable" ){
+            Write-Host -ForegroundColor Yellow "already disable"
+            return
+        }
         try {
             Dism /online /Disable-Feature /FeatureName:$name /NoRestart | Out-Null
-                Write-Host -ForegroundColor Green "done"
+            Write-Host -ForegroundColor Green "done"
         }
         catch {
-            Write-Host -ForegroundColor Red "error"
+            Write-Host -ForegroundColor Red "Error"
+            Write-Debug $Error[0].Exception.Message
         }
     }
     else {
@@ -380,16 +382,16 @@ function DisableFeature {
 
 function UninstallModernApp {
     param(
-            [cmdletbinding(
-                DefaultParameterSetName='params'
-                )]
-            [Parameter(
-                ValueFromPipeline=$False,
-                ParameterSetName="params",
-                Position = 0
-                )]
-            [object]$params
-         )
+        [cmdletbinding(
+            DefaultParameterSetName='params'
+            )]
+        [Parameter(
+            ValueFromPipeline=$False,
+            ParameterSetName="params",
+            Position = 0
+            )]
+        [object]$params
+    )
     if ( $params.ContainsKey('removeProvisioned') -and $params.removeProvisioned -eq $true ) {
         UninstallModernProvisionedApp $params
     }
@@ -400,18 +402,18 @@ function UninstallModernApp {
             UninstallModernApp @{name=$_}
         }
         $uninstall_list |  Where-Object { $_ -notin $pkgs } | Foreach {
-            Write-Host -ForegroundColor Yellow "`tModern App $_ not installed"
+            Write-Debug "`tModern App $_ not installed"
         }
     }
     elseif ( $params.ContainsKey('name') ) {
         Write-Host -NoNewLine "`tUninstall $($params.name) : "
             try {
                 $(Get-AppxPackage -AllUsers | Where-Object { $_.name -like "*$($params.name)*" } | Remove-AppxPackage -AllUsers)
-                    Write-Host -ForegroundColor Green "done"
+                Write-Host -ForegroundColor Green "done"
             }
         catch {
-            Write-Host -NoNewLine -ForegroundColor Red "Error `n`t"
-                write-Host -ForegroundColor DarkRed $_
+            Write-Host -NoNewLine -ForegroundColor Red "Error"
+            Write-Debug $Error[0].Exception.Message
         }
     }
     else {
@@ -421,37 +423,35 @@ function UninstallModernApp {
 
 function UninstallModernProvisionedApp {
     param(
-            [cmdletbinding(
-                DefaultParameterSetName='params'
-                )]
-            [Parameter(
-                ValueFromPipeline=$False,
-                ParameterSetName="params",
-                Position = 0
-                )]
-            [object]$params
-         )
-
+        [cmdletbinding(
+            DefaultParameterSetName='params'
+        )]
+        [Parameter(
+            ValueFromPipeline=$False,
+            ParameterSetName="params",
+            Position = 0
+        )]
+        [object]$params
+     )
     if ( $params.ContainsKey('file') ) {
         $pkgs = $(Get-AppxProvisionedPackage -Online).DisplayName
-            $list = Get-Content $params.file | Where { $_ -notmatch "^#.*$|^$" }
+        $list = Get-Content $params.file | Where { $_ -notmatch "^#.*$|^$" }
         $pkgs | Where-Object { $_ -in $list } | Foreach {
             UninstallModernProvisionedApp @{name=$_}
         }
         $list | Where-Object { $_ -notin $pkgs } | Foreach {
-            Write-Host -ForegroundColor Yellow "`tProvisioned App $_ not found"
+            Write-Debug "`tProvisioned App $_ not found"
         }
     }
     elseif ( $params.ContainsKey('name') ){
         Write-Host -NoNewLine "`tUninstall Provisioned $($params.name) :"
             try {
                 $(Get-AppxProvisionedPackage -Online | Where-Object { $_.DisplayName -eq $($params.name) }) | Remove-AppxProvisionedPackage -Online | Out-Null
-                    Write-Host -ForegroundColor Green "done"
+                Write-Host -ForegroundColor Green "done"
             }
         catch {
-            Write-Host -NoNewLine -ForegroundColor Red "`tError`n`t"
-                write-Host -ForegroundColor DarkRed $Error[0].Exception.Message
-                return
+            Write-Host -NoNewLine -ForegroundColor Red "`tError"
+            Write-Debug $Error[0].Exception.Message
         }
     }
     else {
@@ -461,47 +461,46 @@ function UninstallModernProvisionedApp {
 
 function DisableService {
     param (
-            [cmdletbinding(
-                DefaultParameterSetName='params'
-                )]
-            [Parameter(
-                ValueFromPipeline=$False,
-                ParameterSetName="params",
-                Position = 0
-                )]
-            [object]$params
-          )
+    [cmdletbinding(
+        DefaultParameterSetName='params'
+            )]
+        [Parameter(
+            ValueFromPipeline=$False,
+            ParameterSetName="params",
+            Position = 0
+            )]
+        [object]$params
+    )
     if ( $params.ContainsKey('file') ) {
         $services = $(Get-Service).name
-            $list = Get-Content $params.file | Where { $_ -notmatch "^#.*$|^$" }
+        $list = Get-Content $params.file | Where { $_ -notmatch "^#.*$|^$" }
         $services | Where-Object { $_ -in $list } | Foreach {
             DisableService @{name=$_}
         }
 
         $list | Where-Object { $_ -notin $services } | Foreach {
-            Write-Host -ForegroundColor Yellow "`t Service $_ not found"
+            Write-Debug "`t Service $_ not found"
         }
     }
     elseif ( $params.ContainsKey('name') ) {
         $service = Get-Service -Name $params.name
-            if ( -not $service ){
-                Write-Host -ForegroundColor "`t Service $($params.name) not found"
-                    return
-            }
+        if ( -not $service ){
+            Write-Host -ForegroundColor "`t Service $($params.name) not found"
+            return
+        }
         Write-Host -NoNewline "`tDisable service $($params.name) : "
-            if ( $service.StartType -eq "Disable") {
-                Write-Host -ForegroundColor Yellow "already disabled"
-                    return
-            }
+    if ( $service.StartType -eq "Disable") {
+        Write-Host -ForegroundColor Yellow "already disabled"
+            return
+        }
         try {
-
             Stop-Service -InputObject $service
-                $service | Set-Service -StartupType disabled -ErrorAction Stop
-                Write-Host -ForegroundColor Green "done"
+            $service | Set-Service -StartupType disabled -ErrorAction Stop
+            Write-Host -ForegroundColor Green "done"
         }
         catch {
-            Write-Host -NoNewLine -ForegroundColor Red "Error`n`t"
-                write-Host -ForegroundColor DarkRed $Error[0].Exception.Message
+            Write-Host -ForegroundColor Red "Error"
+            Write-Debug $Error[0].Exception.Message
         }
         finally {
             if ( $params.ContainsKey('userService') -and $params.userService -eq $true ) {
@@ -522,21 +521,21 @@ function DisableService {
 
 function KillProcess {
     param(
-            [cmdletbinding(
-                DefaultParameterSetName='params'
-                )]
+        [cmdletbinding(
+            DefaultParameterSetName='params'
+        )]
 
-            [Parameter(
-                ValueFromPipeline=$False,
-                ParameterSetName="params",
-                Position = 0
-                )]
-            [object]$params
-         )
+        [Parameter(
+            ValueFromPipeline=$False,
+            ParameterSetName="params",
+            Position = 0
+        )]
+        [object]$params
+    )
     Write-Host -NoNewLine "`tKilling $($params.name) : "
     try {
         Stop-Process $(Get-Process $params.name -ErrorAction SilentlyContinue )
-            Write-Host -ForegroundColor Green "Done"
+        Write-Host -ForegroundColor Green "Done"
     }
     catch {
         Write-host -ForegroundColor Yellow "Not started"
@@ -545,21 +544,21 @@ function KillProcess {
 
 function DelFile {
     param (
-            [cmdletbinding(
-                DefaultParameterSetName='params'
-                )]
-            [Parameter(
-                ValueFromPipeline=$False,
-                ParameterSetName="params",
-                Position = 0
-                )]
-            [object]$params
-          )
+        [cmdletbinding(
+            DefaultParameterSetName='params'
+        )]
+        [Parameter(
+            ValueFromPipeline=$False,
+            ParameterSetName="params",
+            Position = 0
+        )]
+        [object]$params
+    )
     $path = Invoke-Expression """$($params.path)"""
     Write-Host -NoNewline "`tDelete $path : "
     if ( -not (Test-Path $path) ){
         Write-Host -ForegroundColor Yellow "not found"
-            return
+        return
     }
     $command = "Remove-Item -ErrorAction SilentlyContinue -Force -Path `"$path`""
     if ( $params.ContainsKey('recurse') -and $params.recurse -eq $true ) {
@@ -567,26 +566,26 @@ function DelFile {
     }
     try {
         Invoke-Expression $command
-            Write-Host -ForegroundColor Green "done"
+        Write-Host -ForegroundColor Green "done"
     }
     catch {
-        Write-Host -NoNewLine -ForegroundColor Red "`Error`n`t"
-            write-Host -ForegroundColor DarkRed $Error[0].Exception.Message
+        Write-Host -ForegroundColor Red "`tError"
+        write-Debug $Error[0].Exception.Message
     }
 }
 
 function ExecCommand {
     param (
-            [cmdletbinding(
-                DefaultParameterSetName='params'
-                )]
-            [Parameter(
-                ValueFromPipeline=$False,
-                ParameterSetName="params",
-                Position = 0
-                )]
-            [object]$params
-          )
+        [cmdletbinding(
+            DefaultParameterSetName='params'
+        )]
+        [Parameter(
+            ValueFromPipeline=$False,
+            ParameterSetName="params",
+            Position = 0
+        )]
+        [object]$params
+    )
     $path = $params.path.Replace("##mod_path##", $script:current_module_path)
     $args = $params.arguments.Replace("##mod_path##", $script:current_module_path)
     Write-Host "`n`tExecute $path : "
@@ -601,25 +600,25 @@ function ExecCommand {
     }
     catch {
         Write-Host -NoNewLine -ForegroundColor Red "`tError`n`t`t"
-        Write-Host -ForegroundColor DarkRed $Error[0].Exception.Message
+        Write-Debug $Error[0].Exception.Message
     }
 }
 
 function ProcessModuleFile {
     param (
-            [Parameter(
-                Mandatory=$true,
-                ValueFromPipeline=$True,
-                ParameterSetName="path"
-                )]
-            [string]$path
-          )
+        [Parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$True,
+            ParameterSetName="path"
+        )]
+        [string]$path
+    )
     try {
         $mod = Get-Content $(Get-ChildItem $path).FullName -Raw | ConvertFrom-Json
     }
     catch {
         Write-Host -ForegroundColor Red "Error While Loading JSON : $path `n`n"
-        #Write-Host -ForegroundColor DarkRed $Error[0].Exception.Message
+        Write-Debug $Error[0].Exception.Message
         return
     }
     Write-Host -ForegroundColor White "`nProcess Module $($mod.name) `n"
@@ -628,20 +627,20 @@ function ProcessModuleFile {
         $action_file = ""
         $current_action = @{}
         $script:current_module_path = $(Get-ChildItem $path).DirectoryName + "\" +  $(Get-ChildItem $path).BaseName + '\'
-            foreach( $p in $_.psobject.properties.name ){
-                $current_action[$p] = $_.$p
-            }
+        foreach( $p in $_.psobject.properties.name ){
+            $current_action[$p] = $_.$p
+        }
         if ( -not  $current_action.ContainsKey('action') ) {
             Write-Host -ForegroundColor Red "`tError : action not found"
-                return
+            return
         }
         # If action content a file element, need to test if file exist
         if ( $current_action.ContainsKey('file')) {
             $action_file =  $script:current_module_path + $current_action.file
-                if ( -not (Test-Path $action_file) ) {
-                    Write-Host -ForegroundColor Red "`tError in $($mod.name) : file $action_file not found`n"
-                        return
-                }
+            if ( -not (Test-Path $action_file) ) {
+                Write-Host -ForegroundColor Red "`tError in $($mod.name) : file $action_file not found`n"
+                return
+            }
             $current_action.file = $action_file
         }
         # Invoke function
@@ -671,15 +670,15 @@ try {
 }
 catch {
     Write-Host -NoNewline -ForegroundColor Red "Error while mounting Registery`n`t"
-    Write-Host -ForegroundColor DarkRed $Error[0].Exception.Message
+    Write-Debug  $Error[0].Exception.Message
     return
 }
 
-#We need access to users registry hive for applying mofidication to existing users
+#We need access to users registry hive for applying modifications to existing users
 $profile_list = "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\"
 Get-LocalUser | Where-Object { $_.Enabled -eq $true } | foreach {
     $current_user_path = Get-ItemPropertyValue -Path "$profile_list$($_.SID.Value)\" -Name "ProfileImagePath"
-        $script:users += @{name = $_.name;'sid' = $_.SID.Value; 'was_mounted' = $false; 'directory' = $current_user_path}
+    $script:users += @{name = $_.name;'sid' = $_.SID.Value; 'was_mounted' = $false; 'directory' = $current_user_path}
 }
 
 Write-Host "Mount users registry hives :"
@@ -692,7 +691,7 @@ $script:users | foreach {
         }
         catch {
             Write-Host -ForegroundColor Red "Error`n`t"
-                Write-host $Error[0].Exception.Message
+            Write-Debug $Error[0].Exception.Message
         }
     }
     else {