diff --git a/SharedClientServer/JSONConvert.cs b/SharedClientServer/JSONConvert.cs
index c52ab50..c62b9ae 100644
--- a/SharedClientServer/JSONConvert.cs
+++ b/SharedClientServer/JSONConvert.cs
@@ -16,8 +16,7 @@ namespace SharedClientServer
 
         public static string GetUsernameLogin(byte[] json)
         {
-            string msg = Encoding.ASCII.GetString(json);
-            dynamic payload = JsonConvert.DeserializeObject(msg);
+            dynamic payload = JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json));
             return payload.username;
         }
     }
diff --git a/SharedClientServer/Lobby.cs b/SharedClientServer/Lobby.cs
index 775edd8..6961ca6 100644
--- a/SharedClientServer/Lobby.cs
+++ b/SharedClientServer/Lobby.cs
@@ -1,41 +1,41 @@
 using SharedClientServer;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text;
-
-namespace Client
-{
-    class Lobby : INotifyPropertyChanged
-    {
-        public event PropertyChangedEventHandler PropertyChanged;
-
-
-        private int _id;
-        private int _playersIn;
-        private int _maxPlayers;
-        //private List<string> _usernames;
-        private List<User> _users;
-
-        //public void AddUsername(string username, out bool success)
-        //{
-        //    success = false;
-        //    if (_usernames.Count < _maxPlayers)
-        //    {
-        //        _usernames.Add(username);
-        //        success = true;
-        //    }
-        //}
-
-        public Lobby(int id, int playersIn, int maxPlayers)
-        {
-            _id = id;
-            _playersIn = playersIn;
-            _maxPlayers = maxPlayers;
-            //_usernames = new List<string>();
-            _users = new List<User>();
-        }
-
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace Client
+{
+    class Lobby : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+
+        private int _id;
+        private int _playersIn;
+        private int _maxPlayers;
+        //private List<string> _usernames;
+        private List<User> _users;
+
+        //public void AddUsername(string username, out bool success)
+        //{
+        //    success = false;
+        //    if (_usernames.Count < _maxPlayers)
+        //    {
+        //        _usernames.Add(username);
+        //        success = true;
+        //    }
+        //}
+
+        public Lobby(int id, int playersIn, int maxPlayers)
+        {
+            _id = id;
+            _playersIn = playersIn;
+            _maxPlayers = maxPlayers;
+            //_usernames = new List<string>();
+            _users = new List<User>();
+        }
+
         public void AddUser(string username, out bool succes)
         {
             succes = false;
@@ -44,8 +44,8 @@ namespace Client
                 _users.Add(new User(username, 0));
                 succes = true;
             }
-        }
-
+        }
+
         public void AddUser(User user, out bool succes)
         {
             succes = false;
@@ -54,26 +54,26 @@ namespace Client
                 _users.Add(user);
                 succes = true;
             }
-        }
-
-        public int ID
-        {
-            get { return _id; }
-            set { _id = value; }
-        }
-
-        public int PlayersIn
-        {
-            get { return _playersIn; }
-            set { _playersIn = value; }
-        }
-
-        public int MaxPlayers
-        {
-            get { return _maxPlayers; }
-            set { _maxPlayers = value; }
-        }
-
-
-    }
-}
+        }
+
+        public int ID
+        {
+            get { return _id; }
+            set { _id = value; }
+        }
+
+        public int PlayersIn
+        {
+            get { return _playersIn; }
+            set { _playersIn = value; }
+        }
+
+        public int MaxPlayers
+        {
+            get { return _maxPlayers; }
+            set { _maxPlayers = value; }
+        }
+
+
+    }
+}