diff --git a/OpenSubtitlesHandler/Interfaces/IMethodResponse.cs b/OpenSubtitlesHandler/Interfaces/IMethodResponse.cs
index 9c05e357b9..0152559fef 100644
--- a/OpenSubtitlesHandler/Interfaces/IMethodResponse.cs
+++ b/OpenSubtitlesHandler/Interfaces/IMethodResponse.cs
@@ -17,7 +17,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 using System;
-using System.ComponentModel;
 
 namespace OpenSubtitlesHandler
 {
diff --git a/OpenSubtitlesHandler/MethodResponses/MethodResponseAutoUpdate.cs b/OpenSubtitlesHandler/MethodResponses/MethodResponseAutoUpdate.cs
index 42d85ef09e..b6dce93606 100644
--- a/OpenSubtitlesHandler/MethodResponses/MethodResponseAutoUpdate.cs
+++ b/OpenSubtitlesHandler/MethodResponses/MethodResponseAutoUpdate.cs
@@ -17,7 +17,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using System.ComponentModel;
 
 namespace OpenSubtitlesHandler
 {
diff --git a/OpenSubtitlesHandler/MethodResponses/MethodResponseServerInfo.cs b/OpenSubtitlesHandler/MethodResponses/MethodResponseServerInfo.cs
index b37862466c..228eda7517 100644
--- a/OpenSubtitlesHandler/MethodResponses/MethodResponseServerInfo.cs
+++ b/OpenSubtitlesHandler/MethodResponses/MethodResponseServerInfo.cs
@@ -18,7 +18,6 @@
  */
 
 using System.Collections.Generic;
-using System.ComponentModel;
 namespace OpenSubtitlesHandler
 {
     [MethodResponseDescription("ServerInfo method response",
diff --git a/OpenSubtitlesHandler/Movies/SearchToMailMovieParameter.cs b/OpenSubtitlesHandler/Movies/SearchToMailMovieParameter.cs
index d5e3fc4c6b..a737cde90d 100644
--- a/OpenSubtitlesHandler/Movies/SearchToMailMovieParameter.cs
+++ b/OpenSubtitlesHandler/Movies/SearchToMailMovieParameter.cs
@@ -19,7 +19,7 @@
 
 namespace OpenSubtitlesHandler
 {
-    public struct  SearchToMailMovieParameter
+    public struct SearchToMailMovieParameter
     {
         private string _moviehash;
         private double _moviesize;
diff --git a/OpenSubtitlesHandler/OpenSubtitles.cs b/OpenSubtitlesHandler/OpenSubtitles.cs
index 91e1e5104e..4c808aac56 100644
--- a/OpenSubtitlesHandler/OpenSubtitles.cs
+++ b/OpenSubtitlesHandler/OpenSubtitles.cs
@@ -17,10 +17,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 using System;
-using System.Globalization;
-using System.Text;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using OpenSubtitlesHandler.Console;
@@ -305,7 +305,8 @@ namespace OpenSubtitlesHandler
                     new XmlRpcValueBasic(param.SubLangaugeID, XmlRpcBasicValueType.String));
                 strct.Members.Add(member);
                 // moviehash member
-                if (param.MovieHash.Length > 0 && param.MovieByteSize > 0) {
+                if (param.MovieHash.Length > 0 && param.MovieByteSize > 0)
+                {
                     member = new XmlRpcStructMember("moviehash",
                         new XmlRpcValueBasic(param.MovieHash, XmlRpcBasicValueType.String));
                     strct.Members.Add(member);
@@ -314,19 +315,21 @@ namespace OpenSubtitlesHandler
                         new XmlRpcValueBasic(param.MovieByteSize, XmlRpcBasicValueType.Int));
                     strct.Members.Add(member);
                 }
-                if (param.Query.Length > 0) {
+                if (param.Query.Length > 0)
+                {
                     member = new XmlRpcStructMember("query",
                         new XmlRpcValueBasic(param.Query, XmlRpcBasicValueType.String));
                     strct.Members.Add(member);
                 }
 
-                 if (param.Episode.Length > 0 && param.Season.Length>0) {
-                     member = new XmlRpcStructMember("season",
-                         new XmlRpcValueBasic(param.Season, XmlRpcBasicValueType.String));
-                     strct.Members.Add(member);
-                     member = new XmlRpcStructMember("episode",
-                       new XmlRpcValueBasic(param.Episode, XmlRpcBasicValueType.String));
-                     strct.Members.Add(member);
+                if (param.Episode.Length > 0 && param.Season.Length > 0)
+                {
+                    member = new XmlRpcStructMember("season",
+                        new XmlRpcValueBasic(param.Season, XmlRpcBasicValueType.String));
+                    strct.Members.Add(member);
+                    member = new XmlRpcStructMember("episode",
+                      new XmlRpcValueBasic(param.Episode, XmlRpcBasicValueType.String));
+                    strct.Members.Add(member);
                 }
 
                 // imdbid member
diff --git a/OpenSubtitlesHandler/SubtitleTypes/SubtitleSearchParameters.cs b/OpenSubtitlesHandler/SubtitleTypes/SubtitleSearchParameters.cs
index 33eeea5cd1..ef607dd4e9 100644
--- a/OpenSubtitlesHandler/SubtitleTypes/SubtitleSearchParameters.cs
+++ b/OpenSubtitlesHandler/SubtitleTypes/SubtitleSearchParameters.cs
@@ -42,19 +42,22 @@ namespace OpenSubtitlesHandler
         private string _query;
         private string _episode;
 
-        public string Episode {
+        public string Episode
+        {
             get { return _episode; }
             set { _episode = value; }
         }
 
-        public string Season {
+        public string Season
+        {
             get { return _season; }
             set { _season = value; }
         }
 
         private string _season;
 
-        public string Query {
+        public string Query
+        {
             get { return _query; }
             set { _query = value; }
         }
@@ -74,6 +77,6 @@ namespace OpenSubtitlesHandler
         /// <summary>
         /// ​IMDb ID of movie this video is part of, belongs to.
         /// </summary>
-        public string IMDbID  { get { return imdbid; } set { imdbid = value; } }
+        public string IMDbID { get { return imdbid; } set { imdbid = value; } }
     }
 }
diff --git a/OpenSubtitlesHandler/SubtitleTypes/TryUploadSubtitlesParameters.cs b/OpenSubtitlesHandler/SubtitleTypes/TryUploadSubtitlesParameters.cs
index 31549227af..f57107cf2f 100644
--- a/OpenSubtitlesHandler/SubtitleTypes/TryUploadSubtitlesParameters.cs
+++ b/OpenSubtitlesHandler/SubtitleTypes/TryUploadSubtitlesParameters.cs
@@ -19,7 +19,7 @@
 
 namespace OpenSubtitlesHandler
 {
-    public class  TryUploadSubtitlesParameters
+    public class TryUploadSubtitlesParameters
     {
         private string _subhash = "";
         private string _subfilename = "";
diff --git a/OpenSubtitlesHandler/Utilities.cs b/OpenSubtitlesHandler/Utilities.cs
index 0806c6fc00..7d0567c4b8 100644
--- a/OpenSubtitlesHandler/Utilities.cs
+++ b/OpenSubtitlesHandler/Utilities.cs
@@ -18,7 +18,6 @@
  */
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/OpenSubtitlesHandler/XML-RPC/XmlRpcGenerator.cs b/OpenSubtitlesHandler/XML-RPC/XmlRpcGenerator.cs
index 1efa3dd5ba..682c04e018 100644
--- a/OpenSubtitlesHandler/XML-RPC/XmlRpcGenerator.cs
+++ b/OpenSubtitlesHandler/XML-RPC/XmlRpcGenerator.cs
@@ -17,10 +17,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 using System;
-using System.Globalization;
-using System.Text;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
+using System.Text;
 using System.Xml;
 using OpenSubtitlesHandler;