diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php
index 66245428..edd32a95 100644
--- a/src/Controller/JobOrderController.php
+++ b/src/Controller/JobOrderController.php
@@ -274,7 +274,7 @@ class JobOrderController extends BaseController
                 $hours = floor($seconds / 3600);
                 $minutes = ceil(($seconds / 60) % 60);
 
-                $outlet['duration'] = ($hours > 0 ? number_format($hours) . "hr" . ($hours > 1 ? "s" : '') . ($minutes > 0 ? ", " : '') : '') . ($minutes > 0 ? number_format($minutes) . " min" . ($minutes > 1 ? "s" : '') : '');
+                $outlet['duration'] = ($hours > 0 ? number_format($hours) . " hr" . ($hours > 1 ? "s" : '') . ($minutes > 0 ? ", " : '') : '') . ($minutes > 0 ? number_format($minutes) . " min" . ($minutes > 1 ? "s" : '') : '');
             } else {
                 $outlet['duration'] = false;
             }
@@ -283,10 +283,7 @@ class JobOrderController extends BaseController
             $meters = $outlet['distance'];
 
             if (!empty($meters) && $meters > 0) {
-                $kms = floor($meters / 1000);
-                $meters = ceil($meters % 1000);
-
-                $outlet['distance'] = ($kms > 0 ? number_format($kms) . "km" . ($meters > 0 ? ", " : '') : '') . ($meters > 0 ? number_format($meters) . " m" : '');
+                $outlet['distance'] = round($meters / 1000) . " km";
             } else {
                 $outlet['distance'] = false;
             }