diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp
index 2c1dc2507d..9338f3eae5 100644
--- a/src/saveload/vehicle_sl.cpp
+++ b/src/saveload/vehicle_sl.cpp
@@ -365,19 +365,19 @@ void AfterLoadVehicles(bool part_of_load)
 			}
 		}
 
-		if ( IsSavegameVersionBefore( SL_REPAIRCOST )) {
+		if (IsSavegameVersionBefore(SL_REPAIRCOST)) {
 			/* repair cost is value for new vehicles and each week +/256 part for old */
 			FOR_ALL_VEHICLES(v) {
 				if (!v->IsPrimaryVehicle()) continue;
 
 				v->repair_cost = v->value;
-				for(int w = 0; w < v->age / 7; w++, v->repair_cost += v->repair_cost >> 8  );
+				for (int w = 0; w < v->age / 7; w++, v->repair_cost += v->repair_cost >> 8);
 				//DEBUG(misc,0, "eid#%d, value=%lld, weeks=%d/%d, repair cost=%lld",
 				//	v->engine_type, (int64)v->value, v->age, v->max_age, (int64)v->repair_cost );
 
-				if ( v->age > v->max_age ) {
-					Date weeks = (v->age - v->max_age)/7;
-					for(int w = 0; w < weeks; w++, v->repair_cost += v->repair_cost >> 8  );
+				if (v->age > v->max_age) {
+					Date weeks = (v->age - v->max_age) / 7;
+					for (int w = 0; w < weeks; w++, v->repair_cost += v->repair_cost >> 8);
 					//DEBUG(misc,0, "OLD: value=%lld, weeks=%d, repair cost=%lld", (int64)v->value, weeks, (int64)v->repair_cost );
 				}
 			}
@@ -702,7 +702,7 @@ const SaveLoad *GetVehicleDescription(VehicleType vt)
 		SLEG_CONDVAR(         _cargo_loaded_at_xy,   SLE_UINT32,                  51,  67),
 		 SLE_CONDVAR(Vehicle, value,                 SLE_FILE_I32 | SLE_VAR_I64,   0,  64),
 		 SLE_CONDVAR(Vehicle, value,                 SLE_INT64,                   65, SL_MAX_VERSION),
-		 SLE_CONDVAR(Vehicle, repair_cost,           SLE_INT64,                   SL_REPAIRCOST, SL_MAX_VERSION),
+		 SLE_CONDVAR(Vehicle, repair_cost,           SLE_INT64,        SL_REPAIRCOST, SL_MAX_VERSION),
 
 		 SLE_CONDVAR(Vehicle, random_bits,           SLE_UINT8,                    2, SL_MAX_VERSION),
 		 SLE_CONDVAR(Vehicle, waiting_triggers,      SLE_UINT8,                    2, SL_MAX_VERSION),
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 5bdc4e6acd..a0bfc7cd8a 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -99,24 +99,28 @@ void VehicleServiceInDepot(Vehicle *v)
 
 	do {
 		v->date_of_last_service = _date;
-		if ( _settings_game.vehicle.pay_for_repair && v->breakdowns_since_last_service ) {
+		if (_settings_game.vehicle.pay_for_repair && v->breakdowns_since_last_service) {
 			ExpensesType type = INVALID_EXPENSES;
 			_current_company = v->owner;
 			switch (v->type) {
-			    case VEH_AIRCRAFT:
-				type = EXPENSES_AIRCRAFT_RUN;
-				break;
-			    case VEH_TRAIN:
-				type = EXPENSES_TRAIN_RUN;
-				break;
-			    case VEH_SHIP:
-				type = EXPENSES_SHIP_RUN;
-				break;
-			    case VEH_ROAD:
-				type = EXPENSES_ROADVEH_RUN;
-				break;
-			    default:
-				NOT_REACHED();
+				case VEH_AIRCRAFT:
+					type = EXPENSES_AIRCRAFT_RUN;
+					break;
+
+				case VEH_TRAIN:
+					type = EXPENSES_TRAIN_RUN;
+					break;
+
+				case VEH_SHIP:
+					type = EXPENSES_SHIP_RUN;
+					break;
+
+				case VEH_ROAD:
+					type = EXPENSES_ROADVEH_RUN;
+					break;
+
+				default:
+					NOT_REACHED();
 			}
 			assert(type != INVALID_EXPENSES);
 			Money repair_cost = (v->breakdowns_since_last_service * v->repair_cost / _settings_game.vehicle.repair_cost) + 1;