diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js b/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js
index c613d54a23..cf7b507b39 100644
--- a/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js
@@ -184,7 +184,7 @@ define(function(require) {
 
   function leasesClock(element){
     var rtn = "";
-    // The charter info is pulled from the schedule action of the first VM of the first role 
+    // The charter info is pulled from the schedule action of the first VM of the first role
     // (element.TEMPLATE.BODY.roles[0].vm_template_contents.SCHED_ACTION)
     if(element && element.TEMPLATE && element.TEMPLATE.BODY && element.TEMPLATE.BODY.start_time && element.TEMPLATE.BODY.roles){
       var startTime = element.TEMPLATE.BODY.start_time;
@@ -205,15 +205,10 @@ define(function(require) {
               !isNaN(parseInt(leases[action.ACTION].time)) &&
               leases[action.ACTION].color
             ){
-              if(action.TIME.startsWith("+")){
-                endTime = action.TIME;
-              } else {
-                endTime = action.TIME - startTime;
-                endTime = endTime.toString();
-              }
+              var endTime = action.TIME.startsWith("+")? action.TIME : action.TIME - startTime;
 
               if(checkTime(startTime, endTime)){
-                rtn = $("<i/>",{class:"describeCharter fa fa-clock",data_start:startTime, data_add:endTime, data_action:action.ACTION}).css({"position":"relative","color":leases[action.ACTION].color});
+                rtn = $("<i/>",{class:"describeCharter fa fa-clock",data_start:startTime, data_add:endTime.toString(), data_action:action.ACTION}).css({"position":"relative","color":leases[action.ACTION].color});
                 if(
                   leases[action.ACTION].warning &&
                   leases[action.ACTION].warning.time &&
diff --git a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
index 9fb7fcbb72..4238cb2632 100644
--- a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
+++ b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
@@ -16,14 +16,14 @@
 
 define(function(require) {
 
-  var Humanize = require('utils/humanize');
-  var LabelsUtils = require('utils/labels/utils');
-  var Locale = require('utils/locale');
-  var OpenNebulaVM = require('opennebula/vm');
+  var Humanize = require("utils/humanize");
+  var LabelsUtils = require("utils/labels/utils");
+  var Locale = require("utils/locale");
+  var OpenNebulaVM = require("opennebula/vm");
   var ScheduleActions = require("utils/schedule_action");
-  var Status = require('utils/status');
-  var TemplateUtils = require('utils/template-utils');
-  var VMRemoteActions = require('utils/remote-actions');
+  var Status = require("utils/status");
+  var TemplateUtils = require("utils/template-utils");
+  var VMRemoteActions = require("utils/remote-actions");
 
   var RESOURCE = "VM";
   var XML_ROOT = "VM";
@@ -57,7 +57,7 @@ define(function(require) {
     var rtn = false;
 
     if (startTime && addedEndTime) {
-      var regexNumber = new RegExp('[0-9]*$','gm');
+      var regexNumber = new RegExp("[0-9]*$","gm");
       var date = parseInt(startTime,10);
       var added = parseInt(addedEndTime.match(regexNumber)[0],10);
 
@@ -114,7 +114,7 @@ define(function(require) {
       "padding":"8px",
       "z-index":"1",
       "min-width":"8rem",
-      "font-family": '"Lato","Helvetica Neue",Helvetica,Roboto,Arial,sans-serif',
+      "font-family": "\"Lato\",\"Helvetica Neue\",Helvetica,Roboto,Arial,sans-serif",
       "color":"#000",
       "font-weight": "bold"
     };
@@ -173,15 +173,10 @@ define(function(require) {
           !isNaN(parseInt(leases[action.ACTION].time)) &&
           leases[action.ACTION].color
         ){
-          if(action.TIME.startsWith("+")){
-            endTime = action.TIME;
-          } else {
-            endTime = action.TIME - element.STIME;
-            endTime = endTime.toString();
-          }
+          var endTime = action.TIME.startsWith("+")? action.TIME : action.TIME - startTime;
 
           if(checkTime(element.STIME, endTime)){
-            rtn = $("<i/>",{class:"describeCharter fa fa-clock",data_start:element.STIME, data_add:endTime, data_action:action.ACTION}).css({"position":"relative","color":leases[action.ACTION].color});
+            rtn = $("<i/>",{class:"describeCharter fa fa-clock",data_start:element.STIME, data_add:endTime.toString(), data_action:action.ACTION}).css({"position":"relative","color":leases[action.ACTION].color});
             if(
               leases[action.ACTION].warning &&
               leases[action.ACTION].warning.time &&