general refectoring

added 42 as dummy Token

38 files changed, 141 insertions, 237 deletions

diff --git a/DSACore/Auxiliary/Calculator/Argument.cs b/DSACore/Auxiliary/Calculator/Argument.cs
index 14982aa..5ed9ee3 100644
--- a/DSACore/Auxiliary/Calculator/Argument.cs
+++ b/DSACore/Auxiliary/Calculator/Argument.cs
@@ -1,9 +1,9 @@
-namespace DSACore.Auxiliary.Calculator
-{
-    using System;
+using System;
 
+namespace DSACore.Auxiliary.Calculator
+{
     /// <summary>
-    /// Provides an ISolvable class to save numbers. The class handles Argument checking and conversion from string to int. 
+    ///     Provides an ISolvable class to save numbers. The class handles Argument checking and conversion from string to int.
     /// </summary>
     public class Argument : ISolvable
     {
diff --git a/DSACore/Auxiliary/Calculator/ISolvable.cs b/DSACore/Auxiliary/Calculator/ISolvable.cs
index 2acbd11..7be4d19 100644
--- a/DSACore/Auxiliary/Calculator/ISolvable.cs
+++ b/DSACore/Auxiliary/Calculator/ISolvable.cs
@@ -1,7 +1,7 @@
 namespace DSACore.Auxiliary.Calculator
 {
     /// <summary>
-    /// Object has to be able to return an integer as it's value
+    ///     Object has to be able to return an integer as it's value
     /// </summary>
     public interface ISolvable
     {
diff --git a/DSACore/Auxiliary/Calculator/Operator.cs b/DSACore/Auxiliary/Calculator/Operator.cs
index ed46186..31b2a9b 100644
--- a/DSACore/Auxiliary/Calculator/Operator.cs
+++ b/DSACore/Auxiliary/Calculator/Operator.cs
@@ -4,7 +4,7 @@ using DSACorev.Auxiliary.Calculator;
 namespace DSACore.Auxiliary.Calculator
 {
     /// <summary>
-    /// The Operator Class represents a binary operator with tow Arguments and an Operation type
+    ///     The Operator Class represents a binary operator with tow Arguments and an Operation type
     /// </summary>
     public class Operator : ISolvable
     {
diff --git a/DSACore/Auxiliary/Calculator/Ops.cs b/DSACore/Auxiliary/Calculator/Ops.cs
index c804257..a5c9a2d 100644
--- a/DSACore/Auxiliary/Calculator/Ops.cs
+++ b/DSACore/Auxiliary/Calculator/Ops.cs
@@ -1,7 +1,7 @@
 namespace DSACorev.Auxiliary.Calculator
 {
     /// <summary>
-    /// The Different Operations, witch can be performed in execution-order
+    ///     The Different Operations, witch can be performed in execution-order
     /// </summary>
     public enum Ops
     {
diff --git a/DSACore/Auxiliary/Calculator/StringSolver.cs b/DSACore/Auxiliary/Calculator/StringSolver.cs
index 212f812..b2a7d83 100644
--- a/DSACore/Auxiliary/Calculator/StringSolver.cs
+++ b/DSACore/Auxiliary/Calculator/StringSolver.cs
@@ -5,28 +5,20 @@ using DSACorev.Auxiliary.Calculator;
 
 namespace DSACore.Auxiliary.Calculator
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-
     /// <summary>
-    /// The StringSolver divides the calculation string into operations and SubStringSolvers if the string contains parentheses 
+    ///     The StringSolver divides the calculation string into operations and SubStringSolvers if the string contains
+    ///     parentheses
     /// </summary>
     public class StringSolver : ISolvable
     {
-        private readonly string input;
         private readonly List<object> arguments = new List<object>();
+        private readonly string input;
 
         public StringSolver(string input)
         {
             this.input = input;
         }
 
-        public override string ToString()
-        {
-            return "(0+" + input.Replace(" ", string.Empty).ToLower() + ")";
-        }
-
         public int Solve()
         {
             var workInput = "0+" + input.Replace(" ", string.Empty).ToLower();
@@ -42,6 +34,11 @@ namespace DSACore.Auxiliary.Calculator
             return ((ISolvable) arguments.First()).Solve();
         }
 
+        public override string ToString()
+        {
+            return "(0+" + input.Replace(" ", string.Empty).ToLower() + ")";
+        }
+
         private static string
             GetInner(ref string input) // extract the inner bracket an remove the section from the input string
         {
@@ -123,7 +120,7 @@ namespace DSACore.Auxiliary.Calculator
                 switch (c)
                 {
                     case ')':
-                        throw new ArgumentException($"Unmögliche Anordnung von Klammern");
+                        throw new ArgumentException("Unmögliche Anordnung von Klammern");
                     case '(':
                         arguments.Add(new StringSolver(GetInner(ref workInput)));
                         index = -1;
diff --git a/DSACore/Auxiliary/CommandInfo.cs b/DSACore/Auxiliary/CommandInfo.cs
index 9afe6c0..1472587 100644
--- a/DSACore/Auxiliary/CommandInfo.cs
+++ b/DSACore/Auxiliary/CommandInfo.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Linq;
 
 namespace DSACore.Auxiliary
 {
diff --git a/DSACore/Auxiliary/SpellCorrect.cs b/DSACore/Auxiliary/SpellCorrect.cs
index 3ef7bb6..77d1cf3 100644
--- a/DSACore/Auxiliary/SpellCorrect.cs
+++ b/DSACore/Auxiliary/SpellCorrect.cs
@@ -1,9 +1,9 @@
-namespace DSACore.Auxiliary
-{
-    using System;
-    using System.Diagnostics;
-    using System.Linq;
+using System;
+using System.Diagnostics;
+using System.Linq;
 
+namespace DSACore.Auxiliary
+{
     public class SpellCorrect : StringComparer
     {
         public const int ErrorThreshold = 94100;
diff --git a/DSACore/Auxiliary/TalentEnumerableExtension.cs b/DSACore/Auxiliary/TalentEnumerableExtension.cs
index 159480d..d83114c 100644
--- a/DSACore/Auxiliary/TalentEnumerableExtension.cs
+++ b/DSACore/Auxiliary/TalentEnumerableExtension.cs
@@ -1,7 +1,7 @@
-using DSACore.DSA_Game.Characters;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using DSACore.DSA_Game.Characters;
 using DSALib;
 
 namespace DSACore.Auxiliary
diff --git a/DSACore/Auxiliary/WeaponImporter.cs b/DSACore/Auxiliary/WeaponImporter.cs
index ab51efb..3375236 100644
--- a/DSACore/Auxiliary/WeaponImporter.cs
+++ b/DSACore/Auxiliary/WeaponImporter.cs
@@ -1,5 +1,4 @@
-using DSACore.Models.Database;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
@@ -7,14 +6,13 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using DSACore.FireBase;
 using DSACore.Models.Database.DSA;
-using Group = System.Text.RegularExpressions.Group;
 
 namespace DSACore.Auxiliary
 {
     public class WeaponImporter
     {
-        private List<MeleeWeapon> Weapons = new List<MeleeWeapon>();
-        private List<RangedWeapon> Range = new List<RangedWeapon>();
+        private readonly List<RangedWeapon> Range = new List<RangedWeapon>();
+        private readonly List<MeleeWeapon> Weapons = new List<MeleeWeapon>();
 
         public async Task DownloadWeapons()
         {
@@ -48,7 +46,7 @@ namespace DSACore.Auxiliary
                 {
                     var talent = lines[j];
 
-                    var values = await client.GetStringAsync($"http://diarium.eu/dsa4-forge/ajax/calculate/" + i + "/" +
+                    var values = await client.GetStringAsync("http://diarium.eu/dsa4-forge/ajax/calculate/" + i + "/" +
                                                              ids[j] + "/0/0/0/0/0/10/0/0/0");
 
                     values = Regex.Unescape(values.Replace(@"\t", ""));
diff --git a/DSACore/Commands/CommandHandler.cs b/DSACore/Commands/CommandHandler.cs
index 6879045..f74f87f 100644
--- a/DSACore/Commands/CommandHandler.cs
+++ b/DSACore/Commands/CommandHandler.cs
@@ -1,7 +1,7 @@
 using System;
 using DSACore.Auxiliary;
+using DSACore.Auxiliary.Calculator;
 using DSACore.DSA_Game;
-using DSACore.Models;
 using DSACore.Models.Network;
 
 namespace DSACore.Commands
@@ -49,7 +49,7 @@ namespace DSACore.Commands
                     res = RandomMisc.Roll(cmd.CmdText + " " + cmd.Cmdmodifier);
                     break;
                 case "solve":
-                    res = new Auxiliary.Calculator.StringSolver(cmd.CmdText + cmd.Cmdmodifier).Solve().ToString();
+                    res = new StringSolver(cmd.CmdText + cmd.Cmdmodifier).Solve().ToString();
                     break;
                 case "npc":
                     res = NpcCommands.CreateNpc(cmd.CharId, cmd.CmdTexts, cmd.Cmdmodifier);
diff --git a/DSACore/Commands/FileHandler.cs b/DSACore/Commands/FileHandler.cs
index d8fb585..bce7c54 100644
--- a/DSACore/Commands/FileHandler.cs
+++ b/DSACore/Commands/FileHandler.cs
@@ -1,13 +1,12 @@
-using DSACore.DSA_Game;
+using System;
+using System.Linq;
+using System.Net;
+using DSACore.DSA_Game;
 using DSACore.DSA_Game.Characters;
+using DSALib;
 
 namespace DSACore.Commands
 {
-    using System;
-    using System.Linq;
-    using System.Net;
-    using DSALib;
-
     public class FileHandler
     {
         public static string AddChar(ulong id, string url)
diff --git a/DSACore/Commands/Gm.cs b/DSACore/Commands/Gm.cs
index 59b3129..98b62db 100644
--- a/DSACore/Commands/Gm.cs
+++ b/DSACore/Commands/Gm.cs
@@ -1,12 +1,5 @@
-using DSACore.Auxiliary;
-using DSACore.DSA_Game;
-
-namespace DSACore.Commands
+namespace DSACore.Commands
 {
-    using System.Linq;
-    using System.Threading.Tasks;
-    using DSALib.Characters;
-
     /*public class Iam 
     {
 
diff --git a/DSACore/Commands/HeldList.cs b/DSACore/Commands/HeldList.cs
index 73861b7..370af34 100644
--- a/DSACore/Commands/HeldList.cs
+++ b/DSACore/Commands/HeldList.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using DSACore.DSA_Game.Characters;
 using DSACore.Auxiliary;
 using DSACore.DSA_Game;
+using DSACore.DSA_Game.Characters;
 
 namespace DSACore.Commands
 {
diff --git a/DSACore/Commands/Help.cs b/DSACore/Commands/Help.cs
index 6458c20..974c44c 100644
--- a/DSACore/Commands/Help.cs
+++ b/DSACore/Commands/Help.cs
@@ -1,39 +1,18 @@
 using System.Linq;
-using System.Threading.Tasks;
 using DSACore.Auxiliary;
+using DSACore.DSA_Game.Save;
 
 namespace DSACore.Commands
 {
     public class Help
     {
-        static Help()
-        {
-            /*TextReader stream = new StreamReader(@"..\..\Help.json"); // Load command-description file
-            var reader = new JsonTextReader(stream); // create stream reader
-
-            reader.Read(); // step into structure, until the array starts
-            reader.Read();
-            reader.Read();
-            
-            try
-            {
-                var test = new JsonSerializer().Deserialize<List<CommandInfo>>(reader); // Deserialize Data and create CommandInfo Struct
-                
-                Commands.AddRange(test); // Add new CommandInfos to List
-            }
-            catch (Exception e)
-            {
-                // ignored
-            }*/
-        }
-
         //public static List<CommandInfo> Commands { get; } = new List<CommandInfo>();
 
 
         public static string Get_Specific_Help(string command)
         {
             // return command specific help
-            var com = DSA_Game.Save.Properties.CommandInfos
+            var com = Properties.CommandInfos
                 .OrderBy(x => SpellCorrect.CompareEasy(x.Name, command.ToLower())).First(); // get best fit command
             return com.GetDescription();
         }
@@ -41,7 +20,7 @@ namespace DSACore.Commands
         public static string Get_Generic_Help()
         {
             var res = "";
-            foreach (var com in DSA_Game.Save.Properties.CommandInfos)
+            foreach (var com in Properties.CommandInfos)
             {
                 var first_column_width = 8;
                 res += ("!" + com.Name + ": ").AddSpaces(first_column_width) + com.Brief;
diff --git a/DSACore/Commands/LebenUndAstral.cs b/DSACore/Commands/LebenUndAstral.cs
index 7e0cb5c..a671296 100644
--- a/DSACore/Commands/LebenUndAstral.cs
+++ b/DSACore/Commands/LebenUndAstral.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Linq;
-using System.Threading.Tasks;
-using DSACore.DSA_Game;
 using DSACore.Auxiliary;
+using DSACore.DSA_Game;
 using DSALib.Characters;
 
 namespace DSACore.Commands
diff --git a/DSACore/Commands/List.cs b/DSACore/Commands/List.cs
index 2c8f3d0..7fc682f 100644
--- a/DSACore/Commands/List.cs
+++ b/DSACore/Commands/List.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
-using DSACore.DSA_Game;
 using DSACore.Audio;
+using DSACore.DSA_Game;
 
 namespace DSACore.Commands
 {
diff --git a/DSACore/Commands/MiscCommands.cs b/DSACore/Commands/MiscCommands.cs
index 36d5fb1..ebd1598 100644
--- a/DSACore/Commands/MiscCommands.cs
+++ b/DSACore/Commands/MiscCommands.cs
@@ -1,15 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
-using DSACore.DSA_Game;
-using DSACore.Auxiliary;
-using Microsoft.AspNetCore.Hosting.Internal;
-
-namespace DSACore.Commands
+namespace DSACore.Commands
 {
     public class MiscCommands
     {
diff --git a/DSACore/Commands/NpcCommands.cs b/DSACore/Commands/NpcCommands.cs
index 9a27e6a..95243ca 100644
--- a/DSACore/Commands/NpcCommands.cs
+++ b/DSACore/Commands/NpcCommands.cs
@@ -1,12 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using DSACore.Characters;
 using DSACore.DSA_Game;
 using DSACore.DSA_Game.Characters;
-using DSACore.Auxiliary;
-using Microsoft.AspNetCore.Mvc.Internal;
 
 namespace DSACore.Commands
 {
diff --git a/DSACore/Controllers/CommandsController.cs b/DSACore/Controllers/CommandsController.cs
index e9700ff..5addf82 100644
--- a/DSACore/Controllers/CommandsController.cs
+++ b/DSACore/Controllers/CommandsController.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using DSACore.Models;
+using DSACore.Commands;
 using DSACore.Models.Network;
 using Microsoft.AspNetCore.Mvc;
 
@@ -33,7 +30,7 @@ namespace DSACore.Controllers
         {
             try
             {
-                return Commands.CommandHandler.ExecuteCommand(cmd).message;
+                return CommandHandler.ExecuteCommand(cmd).message;
             }
             catch (Exception e)
             {
diff --git a/DSACore/Controllers/LobbyController.cs b/DSACore/Controllers/LobbyController.cs
index 100fb5b..df22607 100644
--- a/DSACore/Controllers/LobbyController.cs
+++ b/DSACore/Controllers/LobbyController.cs
@@ -1,5 +1,6 @@
-using DSACore.Models.Network;
 using System;
+using DSACore.Commands;
+using DSACore.Models.Network;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DSACore.Controllers
@@ -19,7 +20,7 @@ namespace DSACore.Controllers
         {
             try
             {
-                return Commands.CommandHandler.ExecuteCommand(cmd).message;
+                return CommandHandler.ExecuteCommand(cmd).message;
             }
             catch (Exception e)
             {
diff --git a/DSACore/Controllers/TokensController.cs b/DSACore/Controllers/TokensController.cs
index 6a59db4..a85cabe 100644
--- a/DSACore/Controllers/TokensController.cs
+++ b/DSACore/Controllers/TokensController.cs
@@ -1,3 +1,4 @@
+using DSACore.Hubs;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DSACore.Controllers
@@ -10,13 +11,15 @@ namespace DSACore.Controllers
         [HttpGet("{token}")]
         public ActionResult<string> Get(string token)
         {
-            if (!int.TryParse(token, out var inttoken))
+            if (!int.TryParse(token, out var intToken))
                 return BadRequest("The token has to be a 32 bit unsigned integer");
 
-            if (!Hubs.Users.Tokens.Exists(x => x.GetHashCode() == inttoken)) return NotFound();
+            if (intToken == 42) return Ok("Scribble");
+            
+            if (!Users.Tokens.Exists(x => x.GetHashCode() == intToken)) return NotFound();
 
-            var group = Hubs.Users.Tokens.Find(x => x.GetHashCode() == inttoken);
-            return Ok(group);
+            var group = Users.Tokens.Find(x => x.GetHashCode() == intToken);
+            return Ok(group.Group);
         }
     }
 }
\ No newline at end of file
diff --git a/DSACore/DSA_Game/Characters/Character.cs b/DSACore/DSA_Game/Characters/Character.cs
index 62d2e11..ac890cb 100644
--- a/DSACore/DSA_Game/Characters/Character.cs
+++ b/DSACore/DSA_Game/Characters/Character.cs
@@ -1,17 +1,15 @@
-using System.IO;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml;
 using DSACore.Auxiliary;
 using DSALib;
 using DSALib.Characters;
 
 namespace DSACore.DSA_Game.Characters
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-    using System.Xml;
-
-
     public class Character : Being, ICharacter
     {
         public Character()
diff --git a/DSACore/DSA_Game/Characters/NPC.cs b/DSACore/DSA_Game/Characters/NPC.cs
index e6b7bed..75c3fe9 100644
--- a/DSACore/DSA_Game/Characters/NPC.cs
+++ b/DSACore/DSA_Game/Characters/NPC.cs
@@ -4,10 +4,6 @@ using DSALib.Characters;
 
 namespace DSACore.Characters
 {
-    using System;
-    using Auxiliary;
-    using DSACore.DSA_Game.Characters;
-
     public class Npc : Being, ICharacter
     {
         private readonly int mean, stDv;
diff --git a/DSACore/DSA_Game/Dsa.cs b/DSACore/DSA_Game/Dsa.cs
index f2ffe48..18d0b81 100644
--- a/DSACore/DSA_Game/Dsa.cs
+++ b/DSACore/DSA_Game/Dsa.cs
@@ -1,18 +1,13 @@
 using System;
-using DSACore.Auxiliary;
-using DSACore.FireBase;
+using System.Collections.Generic;
+using System.Linq;
+using DSACore.DSA_Game.Characters;
+using DSACore.DSA_Game.Save;
 using DSALib;
 using DSALib.Characters;
-using Microsoft.EntityFrameworkCore.Design;
 
 namespace DSACore.DSA_Game
 {
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using Characters;
-    using Save;
-
     public static class Dsa
     {
 #if DEBUG
@@ -59,7 +54,7 @@ namespace DSACore.DSA_Game
             }
 */
 
-            Properties.Deserialize(rootPath + "Properties");
+            Properties.Deserialize();
             Properties.Serialize(rootPath + "Properties");
 
 
diff --git a/DSACore/DSA_Game/Save/Properties.cs b/DSACore/DSA_Game/Save/Properties.cs
index 50bd8fa..7eba911 100644
--- a/DSACore/DSA_Game/Save/Properties.cs
+++ b/DSACore/DSA_Game/Save/Properties.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -8,10 +9,6 @@ using Newtonsoft.Json;
 
 namespace DSACore.DSA_Game.Save
 {
-    using System.Collections;
-    using System.IO;
-    using Newtonsoft.Json;
-
     public static class Properties
     {
         public static Dictionary<string, object> objects;
@@ -64,7 +61,7 @@ namespace DSACore.DSA_Game.Save
                 foreach (var o in objects)
                 {
                     var assembly = o.Value is IList list
-                        ? ((IList) list)[0]?.GetType().FullName
+                        ? list[0]?.GetType().FullName
                         : o.Value.GetType().FullName;
 
                     var name = path + assembly.Replace('.', '-') + ".json";
@@ -76,7 +73,7 @@ namespace DSACore.DSA_Game.Save
             catch (Exception e)
             {
                 // ignored
-                Console.WriteLine($"Speichern von Save-File fehlgeschlagen." + e);
+                Console.WriteLine("Speichern von Save-File fehlgeschlagen." + e);
             }
         }
     }
diff --git a/DSACore/DSA_Game/Save/SaveCommand.cs b/DSACore/DSA_Game/Save/SaveCommand.cs
index 80d4426..f358047 100644
--- a/DSACore/DSA_Game/Save/SaveCommand.cs
+++ b/DSACore/DSA_Game/Save/SaveCommand.cs
@@ -1,18 +1,16 @@
 using System;
+using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace DSACore.DSA_Game.Save
 {
-    using System.IO;
-
     public class SaveCommand
     {
         public void LoadSession(string name = "")
         {
             if (name.Equals("?") || name.Equals(string.Empty))
             {
-                Console.WriteLine($"Gespeicherte Sessions:");
+                Console.WriteLine("Gespeicherte Sessions:");
                 Console.WriteLine(ListSessions());
                 return;
             }
@@ -32,7 +30,7 @@ namespace DSACore.DSA_Game.Save
 
             if (name.Equals("?") || name.Equals(string.Empty))
             {
-                Console.WriteLine($"Gespeicherte Sessions:");
+                Console.WriteLine("Gespeicherte Sessions:");
                 Console.WriteLine(ListSessions());
                 return;
             }
@@ -49,7 +47,7 @@ namespace DSACore.DSA_Game.Save
             {
                 Directory.CreateDirectory(path);
                 Dsa.Session.SessionName = name;
-                Dsa.Session.Save(path + "\\" + name + $"-0.json");
+                Dsa.Session.Save(path + "\\" + name + "-0.json");
             }
 
             Console.WriteLine($"{name} wurde gespeichert");
diff --git a/DSACore/DSA_Game/Save/Session.cs b/DSACore/DSA_Game/Save/Session.cs
index 595f0e8..6944fb1 100644
--- a/DSACore/DSA_Game/Save/Session.cs
+++ b/DSACore/DSA_Game/Save/Session.cs
@@ -1,12 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
+using DSACore.DSA_Game.Characters;
+using Newtonsoft.Json;
 
 namespace DSACore.DSA_Game.Save
 {
-    using System.IO;
-    using Characters;
-    using Newtonsoft.Json;
-
     public class Session
     {
         public static string DirectoryPath { get; set; } = Dsa.rootPath + @"sessions";
diff --git a/DSACore/FireBase/Database.cs b/DSACore/FireBase/Database.cs
index abe2b92..8946cf0 100644
--- a/DSACore/FireBase/Database.cs
+++ b/DSACore/FireBase/Database.cs
@@ -1,14 +1,13 @@
-using DSACore.DSA_Game.Characters;
-using DSACore.Models.Database;
-using Firebase.Database;
-using Firebase.Database.Query;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using DSACore.DSA_Game;
+using DSACore.DSA_Game.Characters;
 using DSACore.Models.Database.DSA;
-using DSACore.Models.Database.Groups;
-
+using DSACore.Models.Network;
+using Firebase.Database;
+using Firebase.Database.Query;
 
 namespace DSACore.FireBase
 {
@@ -16,9 +15,19 @@ namespace DSACore.FireBase
     {
         public static FirebaseClient firebase;
 
+        public static Dictionary<string, DatabaseChar> Chars = new Dictionary<string, DatabaseChar>();
+
+        public static Dictionary<string, MeleeWeapon> MeleeList = new Dictionary<string, MeleeWeapon>();
+
+        public static Dictionary<string, RangedWeapon> RangedWeapons = new Dictionary<string, RangedWeapon>();
+
+        public static Dictionary<string, Talent> Talents = new Dictionary<string, Talent>();
+
+        public static Dictionary<string, GeneralSpell> Spells = new Dictionary<string, GeneralSpell>();
+
         static Database()
         {
-            var auth = File.ReadAllText(DSA_Game.Dsa.rootPath + "Token");
+            var auth = File.ReadAllText(Dsa.rootPath + "Token");
             ; // your app secret
             firebase = new FirebaseClient(
                 "https://heldenonline-4d828.firebaseio.com/",
@@ -49,17 +58,7 @@ namespace DSACore.FireBase
             foreach (var firebaseObject in temp) list.Add(firebaseObject.Key, firebaseObject.Object);
         }
 
-        public static Dictionary<string, DatabaseChar> Chars = new Dictionary<string, DatabaseChar>();
-
-        public static Dictionary<string, MeleeWeapon> MeleeList = new Dictionary<string, MeleeWeapon>();
-
-        public static Dictionary<string, RangedWeapon> RangedWeapons = new Dictionary<string, RangedWeapon>();
-
-        public static Dictionary<string, Talent> Talents = new Dictionary<string, Talent>();
-
-        public static Dictionary<string, GeneralSpell> Spells = new Dictionary<string, GeneralSpell>();
-
-        public static async Task<int> AddChar(Character file, Models.Network.Group group)
+        public static async Task<int> AddChar(Character file, Group group)
         {
             DatabaseChar.LoadChar(file, out var groupChar, out var data);
 
@@ -216,36 +215,36 @@ namespace DSACore.FireBase
                 .OnceSingleAsync<Weapon>();
         }
 
-        public static async Task<List<Models.Network.Group>> GetGroups()
+        public static async Task<List<Group>> GetGroups()
         {
             var groups = await firebase
                 .Child("Groups")
                 .OrderByKey()
-                .OnceAsync<Group>();
-            var ret = new List<Models.Network.Group>();
+                .OnceAsync<Models.Database.Groups.Group>();
+            var ret = new List<Group>();
 
             foreach (var firebaseObject in groups)
-                ret.Add(new Models.Network.Group(firebaseObject.Object.Name, firebaseObject.Object.Password));
+                ret.Add(new Group(firebaseObject.Object.Name, firebaseObject.Object.Password));
 
             return ret;
         }
 
-        public static async Task<Group> GetGroup(int id)
+        public static async Task<Models.Database.Groups.Group> GetGroup(int id)
         {
             var group = await firebase
                 .Child("Groups")
                 .Child("Group" + id)
-                .OnceSingleAsync<Group>();
+                .OnceSingleAsync<Models.Database.Groups.Group>();
             return group;
         }
 
-        public static async Task AddGroup(Group group)
+        public static async Task AddGroup(Models.Database.Groups.Group group)
         {
             var lastChar = await firebase
                 .Child("Groups")
                 .OrderByKey()
                 .LimitToLast(1)
-                .OnceAsync<Group>();
+                .OnceAsync<Models.Database.Groups.Group>();
             var id = group.Id = lastChar.First().Object.Id + 1;
 
             await firebase
@@ -254,7 +253,7 @@ namespace DSACore.FireBase
                 .PutAsync(group);
         }
 
-        public static async void SetGroup(Group group)
+        public static async void SetGroup(Models.Database.Groups.Group group)
         {
             await firebase
                 .Child("Groups")
diff --git a/DSACore/Hubs/Login.cs b/DSACore/Hubs/Login.cs
index f589e49..1f6ca39 100644
--- a/DSACore/Hubs/Login.cs
+++ b/DSACore/Hubs/Login.cs
@@ -1,14 +1,14 @@
-using DSACore.DSA_Game.Characters;
-using DSACore.FireBase;
-using DSACore.Models.Network;
-using Microsoft.AspNetCore.SignalR;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
+using DSACore.Commands;
+using DSACore.DSA_Game.Characters;
+using DSACore.FireBase;
+using DSACore.Models.Network;
+using Microsoft.AspNetCore.SignalR;
 
 namespace DSACore.Hubs
 {
@@ -18,9 +18,6 @@ namespace DSACore.Hubs
 
         private const string ReceiveMethod = "ReceiveMessage"; //receiveMethod;
 
-        private static List<Group> DsaGroups { get; set; }
-        public static List<Token> Tokens { get; } = new List<Token>();
-
         static Users()
         {
             DsaGroups = Database.GetGroups().Result;
@@ -29,6 +26,9 @@ namespace DSACore.Hubs
             //AddGroups();
         }
 
+        private static List<Group> DsaGroups { get; }
+        public static List<Token> Tokens { get; } = new List<Token>();
+
 
         [Obsolete]
         private static async void AddGroups()
@@ -60,7 +60,7 @@ namespace DSACore.Hubs
                 var ident = args.First().Replace("/", "");
                 if (args.Count > 0) args.RemoveAt(0);
 
-                var ret = Commands.CommandHandler.ExecuteCommand(new Command
+                var ret = CommandHandler.ExecuteCommand(new Command
                 {
                     CharId = 0,
                     CmdIdentifier = ident,
@@ -116,8 +116,8 @@ namespace DSACore.Hubs
             var test = await Database.GetGroups();
 
             foreach (var group in test)
-                if (!DsaGroups.Exists(x => x.Name.Equals(@group.Name)))
-                    DsaGroups.Add(@group);
+                if (!DsaGroups.Exists(x => x.Name.Equals(group.Name)))
+                    DsaGroups.Add(group);
 
             await Clients.Caller.SendCoreAsync("ListGroups", new object[] {DsaGroups.Select(x => x.SendGroup())});
             //throw new NotImplementedException("add database call to get groups");
@@ -128,7 +128,7 @@ namespace DSACore.Hubs
             DsaGroups.Add(new Group(group, password));
             var Dgroup = new Models.Database.Groups.Group {Name = group, Id = DsaGroups.Count - 1};
             //Database.AddGroup(Dgroup);
-            await Clients.Caller.SendCoreAsync(ReceiveMethod, new[] {$"group {@group} sucessfully added"});
+            await Clients.Caller.SendCoreAsync(ReceiveMethod, new[] {$"group {group} sucessfully added"});
             //throw new NotImplementedException("add database call to add groups");
         }
 
@@ -202,8 +202,8 @@ namespace DSACore.Hubs
 
                     await Clients.Caller.SendAsync("PlayerStatusChanged", new[] {user.Name, "offline"});
                     //await SendToGroup(user.Name + " disconnected from the Server");
-                    @group.Users.Remove(user);
-                    await Groups.RemoveFromGroupAsync(Context.ConnectionId, @group.Name);
+                    group.Users.Remove(user);
+                    await Groups.RemoveFromGroupAsync(Context.ConnectionId, group.Name);
                 }
                 catch (Exception e)
                 {
diff --git a/DSACore/Models/Database/DSA/DatabaseChar.cs b/DSACore/Models/Database/DSA/DatabaseChar.cs
index 6a57629..872b82e 100644
--- a/DSACore/Models/Database/DSA/DatabaseChar.cs
+++ b/DSACore/Models/Database/DSA/DatabaseChar.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using DSACore.DSA_Game.Characters;
 
 namespace DSACore.Models.Database.DSA
 {
@@ -40,7 +41,7 @@ namespace DSACore.Models.Database.DSA
         public List<WeaponTalent> WeaponTalents { get; set; } = new List<WeaponTalent>();
 
 
-        public static void LoadChar(DSA_Game.Characters.Character file, out GroupChar group, out DatabaseChar data)
+        public static void LoadChar(Character file, out GroupChar group, out DatabaseChar data)
         {
             group = new GroupChar();
             data = new DatabaseChar();
diff --git a/DSACore/Models/Database/DSA/Weapon.cs b/DSACore/Models/Database/DSA/Weapon.cs
index d6d7999..58a44cd 100644
--- a/DSACore/Models/Database/DSA/Weapon.cs
+++ b/DSACore/Models/Database/DSA/Weapon.cs
@@ -26,27 +26,27 @@ namespace DSACore.Models.Database.DSA
 
     public class MeleeWeapon : Weapon
     {
-        public string TpKK { get; set; }
-        public int INI { get; set; }
-        public string MW { get; set; }
-
         public MeleeWeapon(string name, string damage, int weight, string weaponTalent, string price) : base(name,
             damage, weight, weaponTalent, price)
         {
         }
+
+        public string TpKK { get; set; }
+        public int INI { get; set; }
+        public string MW { get; set; }
     }
 
     public class RangedWeapon : Weapon
     {
+        public RangedWeapon(string name, string damage, int weight, string weaponTalent, string price) : base(name,
+            damage, weight, weaponTalent, price)
+        {
+        }
+
         public int AtMod { get; set; }
         public int KKMod { get; set; }
         public string AtReach { get; set; }
         public string TpReach { get; set; }
         public int LoadTime { get; set; }
-
-        public RangedWeapon(string name, string damage, int weight, string weaponTalent, string price) : base(name,
-            damage, weight, weaponTalent, price)
-        {
-        }
     }
 }
\ No newline at end of file
diff --git a/DSACore/Models/Network/Command.cs b/DSACore/Models/Network/Command.cs
index 316461e..00b00a6 100644
--- a/DSACore/Models/Network/Command.cs
+++ b/DSACore/Models/Network/Command.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace DSACore.Models.Network
 {
diff --git a/DSACore/Models/Network/CommandResponse.cs b/DSACore/Models/Network/CommandResponse.cs
index 7478397..c7a410a 100644
--- a/DSACore/Models/Network/CommandResponse.cs
+++ b/DSACore/Models/Network/CommandResponse.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace DSACore.Models.Network
 {
@@ -13,8 +10,8 @@ namespace DSACore.Models.Network
             ResponseType = responseType;
         }
 
-        public string message { get; private set; }
-        public ResponseType ResponseType { get; private set; }
+        public string message { get; }
+        public ResponseType ResponseType { get; }
 
         public override string ToString()
         {
diff --git a/DSACore/Models/Network/Group.cs b/DSACore/Models/Network/Group.cs
index 3a8ce77..efe12ee 100644
--- a/DSACore/Models/Network/Group.cs
+++ b/DSACore/Models/Network/Group.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace DSACore.Models.Network
 {
diff --git a/DSACore/Models/Network/Token.cs b/DSACore/Models/Network/Token.cs
index 0021317..451cafc 100644
--- a/DSACore/Models/Network/Token.cs
+++ b/DSACore/Models/Network/Token.cs
@@ -1,18 +1,18 @@
 using System;
-using Microsoft.EntityFrameworkCore;
 
 namespace DSACore.Models.Network
 {
     public class Token
     {
-        public string Group { get; set; }
-        private DateTime creation = DateTime.Now;
+        private readonly DateTime creation = DateTime.Now;
 
-        public Token(string @group)
+        public Token(string group)
         {
-            Group = @group;
+            Group = group;
         }
 
+        public string Group { get; set; }
+
         public bool IsValid()
         {
             return DateTime.Now - creation < TimeSpan.FromMinutes(1);
diff --git a/DSACore/Models/Network/User.cs b/DSACore/Models/Network/User.cs
index 97a9224..8b8008c 100644
--- a/DSACore/Models/Network/User.cs
+++ b/DSACore/Models/Network/User.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace DSACore.Models.Network
+namespace DSACore.Models.Network
 {
     public class User
     {
diff --git a/DSACore/Program.cs b/DSACore/Program.cs
index 357f919..46baf2d 100644
--- a/DSACore/Program.cs
+++ b/DSACore/Program.cs
@@ -1,13 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
+using DSACore.DSA_Game;
 using DSACore.FireBase;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 
 namespace DSACore
 {
@@ -16,7 +10,7 @@ namespace DSACore
         public static void Main(string[] args)
         {
             Database.GetGroup(0).Wait();
-            DSA_Game.Dsa.Startup();
+            Dsa.Startup();
             CreateWebHostBuilder(args).Build().Run();
         }
 
diff --git a/DSACore/Startup.cs b/DSACore/Startup.cs
index 6f3ec79..372caca 100644
--- a/DSACore/Startup.cs
+++ b/DSACore/Startup.cs
@@ -1,16 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using DSACore.Hubs;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.HttpsPolicy;
 using Microsoft.AspNetCore.Mvc;
-using DSACore.Hubs;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 namespace DSACore
 {