diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
index a7f2c150aa4480e3d801ea23c206b9df0f631afc..b133d57a5912e4ef6bd03fe8a008e44b5bfe0cfd 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
@@ -1862,7 +1862,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 							},
 							evaluateFunction: emTq => {
 								var cfg = new HybridStrategyResponse() {
-									CombustionEngineOn = nextGear.IsLockedGear() ? true : false,
+									CombustionEngineOn = nextGear.IsLockedGear(),
 									GearboxInNeutral = false,
 									MechanicalAssistPower = new Dictionary<PowertrainPosition, Tuple<PerSecond, NewtonMeter>>() {
 										{ emPos, Tuple.Create(firstResponse.ElectricMotor.AngularVelocity, emTq) }
@@ -1901,7 +1901,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 							},
 							evaluateFunction: emTq => {
 								var cfg = new HybridStrategyResponse() {
-									CombustionEngineOn = nextGear.IsLockedGear() ? true : false,
+									CombustionEngineOn = nextGear.IsLockedGear(),
 									GearboxInNeutral = false,
 									MechanicalAssistPower = new Dictionary<PowertrainPosition, Tuple<PerSecond, NewtonMeter>>() {
 										{ emPos, Tuple.Create(firstResponse.ElectricMotor.AngularVelocity, emTq) }
@@ -1957,7 +1957,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 								},
 								evaluateFunction: emTq => {
 									var cfg = new HybridStrategyResponse() {
-										CombustionEngineOn = nextGear.IsLockedGear() ? true : false,
+										CombustionEngineOn = nextGear.IsLockedGear(),
 										GearboxInNeutral = false,
 										MechanicalAssistPower = new Dictionary<PowertrainPosition, Tuple<PerSecond, NewtonMeter>>() {
 											{ emPos, Tuple.Create(firstResponse.ElectricMotor.AngularVelocity, emTq) }
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
index ac0839d7ce8b18e245c24a27e2a810c2ea110248..bc40d360b8a124a13dc50399a3b24f5430db7f23 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
@@ -94,7 +94,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				AssertBusParameters(
 					missionType: mission.MissionType,
 					passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 },
-					airDragAllowed: mission.MissionType == MissionType.Interurban ? true : false,
+					airDragAllowed: mission.MissionType == MissionType.Interurban,
 					doubleDecker: false,
 					busParameters: mission.BusParameter
 				);
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
index 0af2d107ca230d5a915c21983966758616be3b5c..9c8fbd5a2bfa2171272c7e55ba0dbb30c18270f6 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
@@ -112,7 +112,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				AssertBusParameters(
 					missionType: mission.MissionType,
 					passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 },
-					airDragAllowed: mission.MissionType == MissionType.Interurban ? true : false,
+					airDragAllowed: mission.MissionType == MissionType.Interurban,
 					doubleDecker: false,
 					busParameters: mission.BusParameter
 				);
@@ -461,7 +461,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				AssertBusParameters(
 					missionType: mission.MissionType,
 					passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 },
-					airDragAllowed: mission.MissionType == MissionType.Interurban ? true : false,
+					airDragAllowed: mission.MissionType == MissionType.Interurban,
 					doubleDecker: false,
 					busParameters: mission.BusParameter
 				);
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
index 57f5cf213896e456e4f74f5b1ae0080cf69b7a1f..7af5e1d5c21347fc1d4e34066ddfb72dbb73c04f 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
@@ -107,7 +107,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 				AssertBusParameters(
 					missionType: mission.MissionType,
 					passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 },
-					airDragAllowed: mission.MissionType == MissionType.Interurban ? true : false,
+					airDragAllowed: mission.MissionType == MissionType.Interurban,
 					doubleDecker: false,
 					busParameters: mission.BusParameter
 				);