diff --git a/API/Program.cs b/API/Program.cs
index 56182bc..82a6a18 100644
--- a/API/Program.cs
+++ b/API/Program.cs
@@ -1,4 +1,3 @@
-using System.Text.Json.Serialization;
 using OSMDatastructure;
 using OSMDatastructure.Graph;
 using Pathfinding;
diff --git a/OSMDatastructure/Graph/OsmNode.cs b/OSMDatastructure/Graph/OsmNode.cs
index f42a19f..446f230 100644
--- a/OSMDatastructure/Graph/OsmNode.cs
+++ b/OSMDatastructure/Graph/OsmNode.cs
@@ -12,15 +12,15 @@ public class OsmNode
     public OsmNode(ulong nodeId, float lat, float lon)
     {
         this.nodeId = nodeId;
-        this.edges = new();
-        this.coordinates = new Coordinates(lat, lon);
+        edges = new();
+        coordinates = new Coordinates(lat, lon);
     }
 
     [JsonConstructor]
     public OsmNode(ulong nodeId, Coordinates coordinates)
     {
         this.nodeId = nodeId;
-        this.edges = new();
+        edges = new();
         this.coordinates = coordinates;
     }
     
@@ -29,7 +29,8 @@ public class OsmNode
         HashSet<OsmEdge> e = edges.Where(edge => edge.neighborId == n.nodeId).ToHashSet();
         if (e.Count > 0)
             return e.First();
-        else return null;
+        
+        return null;
     }
 
     public override bool Equals(object? obj)
diff --git a/OSMDatastructure/Region.cs b/OSMDatastructure/Region.cs
index d5b7f52..e7e01df 100644
--- a/OSMDatastructure/Region.cs
+++ b/OSMDatastructure/Region.cs
@@ -47,16 +47,12 @@ public class Region
 
     public OsmNode? GetNode(ulong id)
     {
-        if (ContainsNode(id))
-            return nodes.First(node => node.nodeId == id);
-        else return null;
+        return ContainsNode(id) ? nodes.First(node => node.nodeId == id) : null;
     }
 
     public OsmNode? GetNode(Coordinates coordinates)
     {
-        if (ContainsNode(coordinates))
-            return nodes.First(node => node.coordinates.Equals(coordinates));
-        else return null;
+        return ContainsNode(coordinates) ? nodes.First(node => node.coordinates.Equals(coordinates)) : null;
     }
 
 }
\ No newline at end of file
diff --git a/OSMDatastructure/TagManager.cs b/OSMDatastructure/TagManager.cs
index 9420384..f86b149 100644
--- a/OSMDatastructure/TagManager.cs
+++ b/OSMDatastructure/TagManager.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using OSMDatastructure.Graph;
 
 namespace OSMDatastructure;
 
diff --git a/Pathfinding/PathNode.cs b/Pathfinding/PathNode.cs
index 06ec069..9258e6c 100644
--- a/Pathfinding/PathNode.cs
+++ b/Pathfinding/PathNode.cs
@@ -1,4 +1,3 @@
-using System.Diagnostics.Tracing;
 using System.Text.Json.Serialization;
 using OSMDatastructure;
 using OSMDatastructure.Graph;
diff --git a/Pathfinding/Pathfinder.cs b/Pathfinding/Pathfinder.cs
index 4dfa4d0..3a0fca7 100644
--- a/Pathfinding/Pathfinder.cs
+++ b/Pathfinding/Pathfinder.cs
@@ -50,7 +50,7 @@ public class Pathfinder
             if (currentNode.Equals(goalNode))
             {
                 Console.WriteLine("Path found.");
-                this.pathResult = GetPath(goalNode, DateTime.Now - startCalc);
+                pathResult = GetPath(goalNode, DateTime.Now - startCalc);
                 return this;
             }
 
diff --git a/Pathfinding/RegionManager.cs b/Pathfinding/RegionManager.cs
index f82a633..01d491e 100644
--- a/Pathfinding/RegionManager.cs
+++ b/Pathfinding/RegionManager.cs
@@ -23,29 +23,26 @@ namespace Pathfinding
         {
             if(_regions.TryGetValue(id, out Region? value))
                 return value;
-            else
-            {
-                Region? loadedRegion = RegionFromId(id);
-                if(loadedRegion is not null)
-                    _regions.Add(loadedRegion!.regionHash, value: loadedRegion);
-                return loadedRegion;
-            }
+            
+            Region? loadedRegion = RegionFromId(id);
+            if(loadedRegion is not null)
+                _regions.Add(loadedRegion!.regionHash, value: loadedRegion);
+            return loadedRegion;
         }
 
         public Region[] GetAllRegions()
         {
-            return this._regions.Values.ToArray();
+            return _regions.Values.ToArray();
         }
 
         private Region? RegionFromFile(string filePath)
         {
-            Region? retRegion = null;
-            if (File.Exists(filePath))
-            {
-                FileStream regionFile = new FileStream(filePath, FileMode.Open);
-                retRegion = JsonSerializer.Deserialize<Region>(regionFile, Region.serializerOptions)!;
-                regionFile.Dispose();
-            }
+            if (!File.Exists(filePath)) 
+                return null;
+            
+            FileStream regionFile = new (filePath, FileMode.Open);
+            Region retRegion = JsonSerializer.Deserialize<Region>(regionFile, Region.serializerOptions)!;
+            regionFile.Dispose();
             return retRegion;
         }
 
diff --git a/RenderPath/Renderer.cs b/RenderPath/Renderer.cs
index 5cadf14..eda782c 100644
--- a/RenderPath/Renderer.cs
+++ b/RenderPath/Renderer.cs
@@ -1,7 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Drawing;
 using System.Drawing.Imaging;
-using System.Text.Json;
 using OSMDatastructure.Graph;
 using Pathfinding;
 
diff --git a/Server/ConsoleWriter.cs b/Server/ConsoleWriter.cs
index 0c1be48..cbea185 100644
--- a/Server/ConsoleWriter.cs
+++ b/Server/ConsoleWriter.cs
@@ -1,4 +1,3 @@
-using System.Globalization;
 using System.Text;
 
 namespace Server;