diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs
index 1cc72d39..da6e4623 100644
--- a/ReallifeGamemode.Server/Commands/AdminCommands.cs
+++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs
@@ -1547,6 +1547,7 @@ namespace ReallifeGamemode.Server.Commands
       }
 
       ServerVehicle veh = VehicleManager.GetServerVehicleFromVehicle(targetVeh);
+
       if (veh != null)
       {
         ChatService.ErrorMessage(player, "Dieses Fahrzeug wird von einem Server-System benutzt: ~m~" + veh.GetType().Name);
diff --git a/ReallifeGamemode.Server/Job/BusDriverJob.cs b/ReallifeGamemode.Server/Job/BusDriverJob.cs
index cb09c192..e0aca217 100644
--- a/ReallifeGamemode.Server/Job/BusDriverJob.cs
+++ b/ReallifeGamemode.Server/Job/BusDriverJob.cs
@@ -19,6 +19,12 @@ namespace ReallifeGamemode.Server.Job
 
     public override string Name => "Busfahrer";
 
+    private const int MARKER_DELAY = 4000;
+    private const int MARKER_ID = 1;
+    private const int MARKER_SIZE = 7;
+    private const int MARKER_DIST = 6;
+    private const string MARKER_EVENT = "busDriverJob";
+
     public override bool NeedVehicleToStart => false;
 
     private readonly IReadOnlyCollection<Vector3> Skill1Route1 = new List<Vector3>//Bus_Skill_1_Route_1
@@ -257,28 +263,28 @@ namespace ReallifeGamemode.Server.Job
             {
               case 1:
                 {
-                  CheckPointHandle.StartCheckPointRoute(player, Skill1Route1, 4000, 1, 7, 3, true, "busDriverJob");
+                  CheckPointHandle.StartCheckPointRoute(player, Skill1Route1, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
                   player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 1");
                   player.SetData("Route", "Skill1Route1");
                   break;
                 }
               case 2:
                 {
-                  CheckPointHandle.StartCheckPointRoute(player, Skill1Route2, 4000, 1, 7, 3, true, "busDriverJob");
+                  CheckPointHandle.StartCheckPointRoute(player, Skill1Route2, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
                   player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 2");
                   player.SetData("Route", "Skill1Route2");
                   break;
                 }
               case 3:
                 {
-                  CheckPointHandle.StartCheckPointRoute(player, Skill1Route3, 4000, 1, 7, 3, true, "busDriverJob");
+                  CheckPointHandle.StartCheckPointRoute(player, Skill1Route3, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
                   player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 3");
                   player.SetData("Route", "Skill1Route3");
                   break;
                 }
               case 4:
                 {
-                  CheckPointHandle.StartCheckPointRoute(player, Skill1Route4, 4000, 1, 7, 3, true, "busDriverJob");
+                  CheckPointHandle.StartCheckPointRoute(player, Skill1Route4, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
                   player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 4");
                   player.SetData("Route", "Skill1Route4");
                   break;
@@ -301,28 +307,28 @@ namespace ReallifeGamemode.Server.Job
             {
               case 1:
                 {
-                  CheckPointHandle.StartCheckPointRoute(player, Skill2Route1, 4000, 1, 7, 3, true, "busDriverJob");
+                  CheckPointHandle.StartCheckPointRoute(player, Skill2Route1, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
                   player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 1");
                   player.SetData("Route", "Skill2Route1");
                   break;
                 }
               case 2:
                 {
-                  CheckPointHandle.StartCheckPointRoute(player, Skill2Route2, 4000, 1, 7, 3, true, "busDriverJob");
+                  CheckPointHandle.StartCheckPointRoute(player, Skill2Route2, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
                   player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 2");
                   player.SetData("Route", "Skill2Route2");
                   break;
                 }
               case 3:
                 {
-                  CheckPointHandle.StartCheckPointRoute(player, Skill2Route3, 4000, 1, 7, 3, true, "busDriverJob");
+                  CheckPointHandle.StartCheckPointRoute(player, Skill2Route3, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
                   player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 3");
                   player.SetData("Route", "Skill2Route3");
                   break;
                 }
               case 4:
                 {
-                  CheckPointHandle.StartCheckPointRoute(player, Skill2Route4, 4000, 1, 7, 3, true, "busDriverJob");
+                  CheckPointHandle.StartCheckPointRoute(player, Skill2Route4, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
                   player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 4");
                   player.SetData("Route", "Skill2Route3");
                   break;
@@ -339,28 +345,28 @@ namespace ReallifeGamemode.Server.Job
             {
               case 1:
                 {
-                  CheckPointHandle.StartCheckPointRoute(player, Skill3Route1, 4000, 1, 7, 3, true, "busDriverJob");
+                  CheckPointHandle.StartCheckPointRoute(player, Skill3Route1, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
                   player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 1");
                   player.SetData("Route", "Skill3Route1");
                   break;
                 }
               case 2:
                 {
-                  CheckPointHandle.StartCheckPointRoute(player, Skill3Route2, 4000, 1, 7, 3, true, "busDriverJob");
+                  CheckPointHandle.StartCheckPointRoute(player, Skill3Route2, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
                   player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 2");
                   player.SetData("Route", "Skill3Route2");
                   break;
                 }
               case 3:
                 {
-                  CheckPointHandle.StartCheckPointRoute(player, Skill3Route3, 4000, 1, 7, 3, true, "busDriverJob");
+                  CheckPointHandle.StartCheckPointRoute(player, Skill3Route3, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
                   player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 3");
                   player.SetData("Route", "Skill3Route3");
                   break;
                 }
               case 4:
                 {
-                  CheckPointHandle.StartCheckPointRoute(player, Skill3Route4, 4000, 1, 7, 3, true, "busDriverJob");
+                  CheckPointHandle.StartCheckPointRoute(player, Skill3Route4, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
                   player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 4");
                   player.SetData("Route", "Skill3Route4");
                   break;