@@ -128,7 +128,7 @@ private void authButton_Click(object sender, EventArgs e)
 
         private async void RunAuthentication()
         {
-            WebApiFactory webApiFactory = new WebApiFactory(
+            WebAPIFactory webApiFactory = new WebAPIFactory(
                 "http://localhost",
                 8000,
                 "26d287105e31491889f3cd293d85bfea",
 
@@ -60,17 +60,9 @@ public ISynchronizeInvoke SynchronizingObject
 
         public event EventHandler<TrackTimeChangeEventArgs> OnTrackTimeChange;
 
-        public SpotifyLocalAPI()
+        public SpotifyLocalAPI(int timerIntervall = 50)
         {
             _rh = new RemoteHandler();
-
-            AttachTimer(50);
-        }
-
-        public SpotifyLocalAPI(int timerIntervall)
-        {
-            _rh = new RemoteHandler();
-
             AttachTimer(timerIntervall);
         }
 
 
@@ -58,7 +58,7 @@
     </Compile>
     <Compile Include="Local\Models\SpotifyUri.cs" />
     <Compile Include="Local\VolumeMixerControl.cs" />
-    <Compile Include="Web\Auth\WebApiFactory.cs" />
+    <Compile Include="Web\Auth\WebAPIFactory.cs" />
     <Compile Include="Web\Enums\TimeRangeType.cs" />
     <Compile Include="Web\IClient.cs" />
     <Compile Include="Local\Models\CFID.cs" />
 
@@ -6,30 +6,30 @@
 
 namespace SpotifyAPI.Web.Auth
 {
-    public class WebApiFactory
+    public class WebAPIFactory
     {
-        private readonly string m_RedirectUrl;
-        private readonly int m_ListeningPort;
-        private readonly string m_ClientId;
-        private readonly TimeSpan m_Timeout;
-        private Scope m_Scope;
+        private readonly string _redirectUrl;
+        private readonly int _listeningPort;
+        private readonly string _clientId;
+        private readonly TimeSpan _timeout;
+        private readonly Scope _scope;
 
-        public WebApiFactory(string redirectUrl, int listeningPort, string clientId, Scope scope, TimeSpan timeout)
+        public WebAPIFactory(string redirectUrl, int listeningPort, string clientId, Scope scope, TimeSpan timeout)
         {
-            m_RedirectUrl = redirectUrl;
-            m_ListeningPort = listeningPort;
-            m_ClientId = clientId;
-            m_Scope = scope;
-            m_Timeout = timeout;
+            _redirectUrl = redirectUrl;
+            _listeningPort = listeningPort;
+            _clientId = clientId;
+            _scope = scope;
+            _timeout = timeout;
         }
 
         public Task<SpotifyWebAPI> GetWebApi()
         {
             var authentication = new ImplicitGrantAuth
             {
-                RedirectUri = $"{m_RedirectUrl}:{m_ListeningPort}",
-                ClientId = m_ClientId,
-                Scope = m_Scope,
+                RedirectUri = $"{_redirectUrl}:{_listeningPort}",
+                ClientId = _clientId,
+                Scope = _scope,
                 State = "XSS"
             };
 
@@ -43,13 +43,13 @@ public Task<SpotifyWebAPI> GetWebApi()
 
             try
             {
-                authentication.StartHttpServer(m_ListeningPort);
+                authentication.StartHttpServer(_listeningPort);
 
                 authentication.DoAuth();
 
-                authenticationWaitFlag.WaitOne(m_Timeout);
+                authenticationWaitFlag.WaitOne(_timeout);
                 if (spotifyWebApi == null)
-                    throw new TimeoutException($"No valid response received for the last {m_Timeout.TotalSeconds} seconds");
+                    throw new TimeoutException($"No valid response received for the last {_timeout.TotalSeconds} seconds");
             }
             finally
             {
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ private void authButton_Click(object sender, EventArgs e)`
`128`	`128`
`129`	`129`	`private async void RunAuthentication()`
`130`	`130`	`{`
`131`		`- WebApiFactory webApiFactory = new WebApiFactory(`
	`131`	`+ WebAPIFactory webApiFactory = new WebAPIFactory(`
`132`	`132`	`"http://localhost",`
`133`	`133`	`8000,`
`134`	`134`	`"26d287105e31491889f3cd293d85bfea",`