diff --git a/cleanW10.ps1 b/cleanW10.ps1
index 53117e9..3425d08 100644
--- a/cleanW10.ps1
+++ b/cleanW10.ps1
@@ -9,21 +9,21 @@ $ErrorActionPreference = "SilentlyContinue"
 function block_shitty_host {
     param([string]$filename, [string]$ip, [string]$hostname)
     remove-host $filename $hostname
-    Write-Host -NoNewline -ForegroundColor White "Block host $hostname : "
+    Write-Host -NoNewline -ForegroundColor White "Block shitty host $hostname"
     try {
         if ( ! $(is_host_present $filename $hostname) ){
             $ip + "`t`t" + $hostname | Out-File -encoding ASCII -append $filename
         }
         else {
-            Write-Host -ForegroundColor Yellow "already blocked "
+            Write-Host -ForegroundColor Yellow " Already blocked "
             return
         }
     }
     catch {
-        Write-Host -ForegroundColor Red "error"
+        Write-Host -ForegroundColor Red " Error "
         return
     }
-    Write-Host -ForegroundColor Green "done"
+    Write-Host -ForegroundColor Green " done "
 }
 
 function is_host_present {
@@ -43,7 +43,7 @@ function block_shitty_ip {
     param($ip)
     Write-Host -ForegroundColor white -NoNewline "Blacklist IP $ip : "
     if ( Get-NetFirewallRule -Name Blacklist_$ip -ErrorAction SilentlyContinue) {
-       Write-Host -ForegroundColor Yellow "already blacklisted"
+       Write-Host -ForegroundColor Yellow "Already blacklisted"
        return
     }
     else {
@@ -51,31 +51,31 @@ function block_shitty_ip {
             New-NetFirewallRule -Name Blacklist_$ip -DisplayName "BlackList $ip" -Protocol any -Enabled True -Profile Any -RemoteAddress $ip -Action Block | Out-Null
         }
         Catch {
-            Write-Host -ForegroundColor Red "error"
+            Write-Host -Nonewline -ForegroundColor Red " Error "
             return
         }
-        Write-Host -ForegroundColor Green "done"
+        Write-Host -ForegroundColor Green " Done"
     }
 }
 
 function remove_shitty_tasks () {
     param($taskList)
     Foreach ($task in $taskList){
-        Write-Host -ForegroundColor white -NoNewline "Remove Task $task : "
+        Write-Host -ForegroundColor white -NoNewline "Remove Task " $task
         if ($PSVersionTable.PSVersion.Major -gt 2) {
             if (Get-ScheduledTask -TaskName $task -ErrorAction SilentlyContinue) {
-                Write-Host -NoNewline -ForegroundColor DarkGreen "found! "
-                Write-Host -Nonewline -ForegroundColor white "removing : "
+                Write-Host -NoNewline -ForegroundColor DarkGreen " found! "
+                Write-Host -Nonewline -ForegroundColor white "removing ... "
                 Try {Unregister-ScheduledTask -TaskName $task -ErrorAction SilentlyContinue -Confirm:$false}
                 Catch {
-                    Write-Host -Nonewline -ForegroundColor Red "error"
+                    Write-Host -Nonewline -ForegroundColor Red " Error "
                 }
-                Write-Host -ForegroundColor Green "done"
+                Write-Host -ForegroundColor Green " Done"
             }
-            else { Write-Host -ForegroundColor Yellow "already removed"}
+            else { Write-Host -ForegroundColor Yellow " Already removed"}
         }
         else {
-            Write-Host -Nonewline -ForegroundColor Red "damned! this is not Windows 10!"
+            Write-Host -Nonewline -ForegroundColor Red " Damned! this is not Windows 10!"
         }
     }
 }
@@ -87,9 +87,9 @@ function remove_shitty_tasks () {
 #   value   : The value to write
 function modify_shitty_reg_value {
     param([string]$path, [string]$key, [string]$value, [string]$type)
-    Write-Host -ForegroundColor white -NoNewline "Modify $key reg value to $value : "
+    Write-Host -ForegroundColor white -NoNewline "Modify $key reg value to $value :"
     if (!(Test-Path $path)){
-        Write-Host -ForegroundColor Gray -NoNewline "creating path - "
+        Write-Host -ForegroundColor Gray -NoNewline " creating path "
         New-Item -Path $path -Force | Out-Null
     }
 
@@ -102,15 +102,15 @@ function modify_shitty_reg_value {
         }
     }
     catch [System.Security.SecurityException]{
-        Write-Host -ForegroundColor Red "access denied"
+        Write-Host -ForegroundColor Red "Access denied"
         return
     }
     catch {
-        Write-Host -ForegroundColor Red "error "
+        Write-Host -ForegroundColor Red " Error "
         Write-Host $Error[0]
         return
     }
-    Write-host -ForegroundColor Green "done "
+    Write-host -ForegroundColor Green " done "
 }
 
 # Function to remove shitty prog from shitty win
@@ -126,77 +126,78 @@ function disable_shitty_feature {
             Dism /online /Disable-Feature /FeatureName:$name /NoRestart | Out-Null
         }
         catch {
-            Write-Host -ForegroundColor Red "error"
+            Write-Host -ForegroundColor Red " Error"
             Return
         }
-        Write-Host -ForegroundColor Green "done "
+        Write-Host -ForegroundColor Green " done "
     }
     else {
-        Write-Host -ForegroundColor Yellow "already disable "
+        Write-Host -ForegroundColor Yellow " already disable "
     }
 }
 
-# remove unwanted "Modern App"
+# disable "Modern App"
 # Params
-#   $pkg   : Package (Object)
-function remove_shitty_modern_app {
-    param($pkg)
-	Write-Host -ForegroundColor white  -NoNewLine "Remove $($pkg.Name) modern app : "
-	try {
-		$pkg | Remove-AppxPackage
+#   $name   : Name of modern app
+function disable_shitty_modern_app {
+    param([string]$name)
+	Write-Host -ForegroundColor white  -NoNewLine "Remove $name modern app"
+	$package = Get-AppxPackage -AllUsers -name *$name*
+	if ( $package ) {
+		Write-Host -ForegroundColor white  -NoNewLine " installed :"
+		try {
+			$package | Remove-AppxPackage
+		}
+		catch {
+			Write-Host -ForegroundColor Red " Uninstall error"
+			return
+		}
+		Write-Host -ForegroundColor Green  -NoNewLine " uninstalled"
 	}
-	catch {
-	    Write-Host -ForegroundColor Red "error"
-        write-Host $Error[0]
-        return
-	}
-	Write-Host -ForegroundColor Green "done"
-}
+	else { Write-Host -ForegroundColor Yellow -NoNewLine " Not installed"}
 
-function remove_provisioned_shitty_modern_app {
-    param($pkg)
-	Write-Host -ForegroundColor white -NoNewline "remove provisioned $($pkg.DisplayName) : "
-    try {
-		$pkg | Remove-AppxProvisionedPackage -Online | Out-Null
+	Write-Host -ForegroundColor white -NoNewLine " |"
+	$provisioned = Get-AppxProvisionedPackage -Online | where-Object {$_.PackageName -like "*$name*"}
+	if ( $provisioned ) {
+		Write-Host -ForegroundColor White -NoNewLine " Provisonned"
+		try {
+			$provisioned | Remove-AppxProvisionedPackage -Online | Out-Null
+		}
+		catch {
+			Write-Host -ForegroundColor red " Error"
+			return
+		}
+		Write-Host -ForegroundColor Green " Done"
 	}
-	catch {
-		Write-Host -ForegroundColor red "error"
-        Write-Host $Error[0]
-		return
-	}
-	Write-Host -ForegroundColor Green "done"
+	else { Write-Host -ForegroundColor Yellow " Not provisionned"}
 }
 
 function disable_shitty_service ([string]$name){
-    Write-Host -ForegroundColor White -NoNewline "Disable service $name : "
+    Write-Host -ForegroundColor White -NoNewline "Disable service $name :"
     $serv = Get-Service -name $name
     if ( !$serv) {
-        Write-Host -ForegroundColor Red "not found "
+        Write-Host -ForegroundColor Red " Not found "
         return
     }
     if ( $serv.StartType -eq "Disable") {
-        Write-Host -ForegroundColor Yellow "already disabled"
+        Write-Host -ForegroundColor Yellow " Already disabled"
     }
     else {
         service Stop-Service -InputObject $serv -PassThru | Set-Service -StartupType disabled
-        Write-Host -ForegroundColor Green "done "
+        Write-Host -ForegroundColor Green " Done "
     }
 }
 
-Write-Output "`nI's time to kick ass and chew bubble gum"
-Write-Output "________________________________________`n"
+Write-Output ""
+Write-Output "I's time to kick ass and chew bubble gum"
+Write-Output "________________________________________"
+write-Output ""
 
 foreach ($line in Get-Content "lib\hosts.txt"){ block_shitty_host $HOST_FILE $HOST_IP $line }
 foreach ($line in Get-Content "lib\ip.txt"){ block_shitty_ip $line }
 foreach ($line in Get-Content "lib\features.txt"){ disable_shitty_feature $line }
 foreach ($line in Get-Content "lib\services.txt") { disable_shitty_featureService $line }
-Get-AppxPackage -AllUsers | Where-Object { $_.name -in $(Get-Content "lib\apps.txt")} | foreach {
-    remove_shitty_modern_app $_
-}
-Get-AppxProvisionedPackage -Online | Where-Object { $_.DisplayName -in $(Get-Content "lib\apps.txt")} | foreach {
-    remove_provisioned_shitty_modern_app $_
-}
-
+foreach ($line in Get-Content "lib\apps.txt") { disable_shitty_modern_app $line }
 foreach ($line in Get-Content "lib\tasks.txt") {remove_shitty_tasks $line }
 
 
@@ -250,7 +251,7 @@ modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "
 modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessCalendar" 2
 modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessCallHistory" 2
 modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessCamera" 2
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessContacts" 2
+    modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessContacts" 2
 modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessEmail" 2
 modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessLocation" 2
 modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessMessaging" 2