diff --git a/osrepodbmgr.Core/AlgoEnum.cs b/osrepodbmgr.Core/AlgoEnum.cs
index 322cebc..934caee 100644
--- a/osrepodbmgr.Core/AlgoEnum.cs
+++ b/osrepodbmgr.Core/AlgoEnum.cs
@@ -25,7 +25,6 @@
 //  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 //  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
-using System;
 namespace osrepodbmgr.Core
 {
     public enum AlgoEnum
diff --git a/osrepodbmgr.Core/ChangeLog b/osrepodbmgr.Core/ChangeLog
index d768aff..c89dd88 100644
--- a/osrepodbmgr.Core/ChangeLog
+++ b/osrepodbmgr.Core/ChangeLog
@@ -1,3 +1,13 @@
+2017-05-19  Natalia Portillo  <claunia@claunia.com>
+
+	* AlgoEnum.cs:
+	* Workers/Clamd.cs:
+	* Workers/Files.cs:
+	* Workers/Consts.cs:
+	* Workers/Delegates.cs:
+	* Workers/VirusTotal.cs:
+	  Refactor: Sort and remove usings.
+
 2017-05-19  Natalia Portillo  <claunia@claunia.com>
 
 	* DBOps.cs:
diff --git a/osrepodbmgr.Core/Workers/Clamd.cs b/osrepodbmgr.Core/Workers/Clamd.cs
index 7abafe9..65906d8 100644
--- a/osrepodbmgr.Core/Workers/Clamd.cs
+++ b/osrepodbmgr.Core/Workers/Clamd.cs
@@ -26,14 +26,13 @@
 //  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 using System;
-using nClam;
-using System.Threading.Tasks;
-using System.IO;
-using SharpCompress.Compressors.LZMA;
-using SharpCompress.Compressors.Deflate;
-using SharpCompress.Compressors.BZip2;
-using System.Threading;
 using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using nClam;
+using SharpCompress.Compressors.BZip2;
+using SharpCompress.Compressors.Deflate;
+using SharpCompress.Compressors.LZMA;
 
 namespace osrepodbmgr.Core
 {
diff --git a/osrepodbmgr.Core/Workers/Consts.cs b/osrepodbmgr.Core/Workers/Consts.cs
index 4c76e66..231379d 100644
--- a/osrepodbmgr.Core/Workers/Consts.cs
+++ b/osrepodbmgr.Core/Workers/Consts.cs
@@ -25,7 +25,6 @@
 //  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 //  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
-using System;
 namespace osrepodbmgr.Core
 {
     public static partial class Workers
diff --git a/osrepodbmgr.Core/Workers/Delegates.cs b/osrepodbmgr.Core/Workers/Delegates.cs
index 91a3829..1b9497a 100644
--- a/osrepodbmgr.Core/Workers/Delegates.cs
+++ b/osrepodbmgr.Core/Workers/Delegates.cs
@@ -25,7 +25,6 @@
 //  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 //  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
-using System;
 using System.Collections.Generic;
 
 namespace osrepodbmgr.Core
diff --git a/osrepodbmgr.Core/Workers/Files.cs b/osrepodbmgr.Core/Workers/Files.cs
index 299ae83..083ad4d 100644
--- a/osrepodbmgr.Core/Workers/Files.cs
+++ b/osrepodbmgr.Core/Workers/Files.cs
@@ -932,10 +932,11 @@ namespace osrepodbmgr.Core
                 try
                 {
                     File.Delete(file);
-                }
-#pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
-                catch
-#pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
                {
+                }
+#pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
+                catch
+#pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
+                {
                     // Do not crash
                 }
 
diff --git a/osrepodbmgr.Core/Workers/VirusTotal.cs b/osrepodbmgr.Core/Workers/VirusTotal.cs
index aec60b1..3a7c3bc 100644
--- a/osrepodbmgr.Core/Workers/VirusTotal.cs
+++ b/osrepodbmgr.Core/Workers/VirusTotal.cs
@@ -26,17 +26,16 @@
 //  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 using System;
-using VirusTotalNET;
-using VirusTotalNET.Results;
-using System.Text;
-using System.Threading.Tasks;
-using System.IO;
-using VirusTotalNET.Objects;
 using System.Collections.Generic;
-using SharpCompress.Compressors.Deflate;
-using SharpCompress.Compressors.BZip2;
-using SharpCompress.Compressors.LZMA;
+using System.IO;
 using System.Threading;
+using System.Threading.Tasks;
+using SharpCompress.Compressors.BZip2;
+using SharpCompress.Compressors.Deflate;
+using SharpCompress.Compressors.LZMA;
+using VirusTotalNET;
+using VirusTotalNET.Objects;
+using VirusTotalNET.Results;
 
 namespace osrepodbmgr.Core
 {
diff --git a/osrepodbmgr.Eto.Desktop/ChangeLog b/osrepodbmgr.Eto.Desktop/ChangeLog
index f6b1a37..03bc7e6 100644
--- a/osrepodbmgr.Eto.Desktop/ChangeLog
+++ b/osrepodbmgr.Eto.Desktop/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-19  Natalia Portillo  <claunia@claunia.com>
+
+	* Program.cs:
+	  Refactor: Sort and remove usings.
+
 2017-05-19  Natalia Portillo  <claunia@claunia.com>
 
 	* Program.cs:
diff --git a/osrepodbmgr.Eto.Desktop/Program.cs b/osrepodbmgr.Eto.Desktop/Program.cs
index c13f391..a41d7f6 100644
--- a/osrepodbmgr.Eto.Desktop/Program.cs
+++ b/osrepodbmgr.Eto.Desktop/Program.cs
@@ -39,12 +39,12 @@ namespace osrepodbmgr.Eto.Desktop
         {
             Settings.LoadSettings();
             Context.CheckUnar();
-            if(Core.Settings.Current.UseAntivirus)
+            if(Settings.Current.UseAntivirus)
             {
-                if(Core.Settings.Current.UseClamd)
+                if(Settings.Current.UseClamd)
                     Workers.InitClamd();
-                if(Core.Settings.Current.UseVirusTotal)
-                    Context.virusTotalEnabled = Workers.InitVirusTotal(Core.Settings.Current.VirusTotalKey);
+                if(Settings.Current.UseVirusTotal)
+                    Context.virusTotalEnabled = Workers.InitVirusTotal(Settings.Current.VirusTotalKey);
             }
             Context.usableDotNetZip = !Platform.Detect.IsMac && !Platform.Detect.IsIos;
             
diff --git a/osrepodbmgr.Eto.XamMac2/ChangeLog b/osrepodbmgr.Eto.XamMac2/ChangeLog
index ef1df1d..8f04b0d 100644
--- a/osrepodbmgr.Eto.XamMac2/ChangeLog
+++ b/osrepodbmgr.Eto.XamMac2/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-19  Natalia Portillo  <claunia@claunia.com>
+
+	* Program.cs:
+	  Refactor: Sort and remove usings.
+
 2017-05-19  Natalia Portillo  <claunia@claunia.com>
 
 	* Program.cs:
diff --git a/osrepodbmgr.Eto.XamMac2/Program.cs b/osrepodbmgr.Eto.XamMac2/Program.cs
index 880924c..598a62f 100644
--- a/osrepodbmgr.Eto.XamMac2/Program.cs
+++ b/osrepodbmgr.Eto.XamMac2/Program.cs
@@ -39,12 +39,12 @@ namespace osrepodbmgr.Eto.XamMac2
         {
             Settings.LoadSettings();
             Context.CheckUnar();
-            if(Core.Settings.Current.UseAntivirus)
+            if(Settings.Current.UseAntivirus)
             {
-                if(Core.Settings.Current.UseClamd)
+                if(Settings.Current.UseClamd)
                     Workers.InitClamd();
-                if(Core.Settings.Current.UseVirusTotal)
-                    Context.virusTotalEnabled = Workers.InitVirusTotal(Core.Settings.Current.VirusTotalKey);
+                if(Settings.Current.UseVirusTotal)
+                    Context.virusTotalEnabled = Workers.InitVirusTotal(Settings.Current.VirusTotalKey);
             }
             Context.usableDotNetZip = false;
             new Application(Platforms.XamMac2).Run(new frmMain());
diff --git a/osrepodbmgr/ChangeLog b/osrepodbmgr/ChangeLog
index 34b2ad9..346d270 100644
--- a/osrepodbmgr/ChangeLog
+++ b/osrepodbmgr/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-19  Natalia Portillo  <claunia@claunia.com>
+
+	* frmMain.cs:
+	  Refactor: Sort and remove usings.
+
 2017-05-19  Natalia Portillo  <claunia@claunia.com>
 
 	* frmMain.cs:
diff --git a/osrepodbmgr/frmMain.cs b/osrepodbmgr/frmMain.cs
index 3111e79..3099e36 100644
--- a/osrepodbmgr/frmMain.cs
+++ b/osrepodbmgr/frmMain.cs
@@ -27,7 +27,6 @@
 //
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Threading;
 using Gtk;
 using osrepodbmgr.Core;