diff --git a/lib/timeline/TimeStep.js b/lib/timeline/TimeStep.js
index 12a7336c..4bb8f3dd 100644
--- a/lib/timeline/TimeStep.js
+++ b/lib/timeline/TimeStep.js
@@ -618,7 +618,8 @@ TimeStep.prototype.getClassName = function() {
         even(current.minutes()).trim();
 
     case 'hour':
-      return 'vis-h' + current.hours() + (this.step == 4 ? '-h' + (current.hours() + 4) : '') +
+      return 'vis-h' + current.hours() + 
+        (this.step == 4 ? '-h' + (current.hours() + 4) : '') +
         today(current) +
         even(current.hours());
 
@@ -633,9 +634,8 @@ TimeStep.prototype.getClassName = function() {
         ' vis-' + current.format('MMMM').toLowerCase() +
         today(current) +
         currentMonth(current) +
-        this.step <= 2 ? today(current) : '' +
-        this.step <= 2 ? ' vis-' + current.format('dddd').toLowerCase() : '' +
-        even(current.date() - 1);
+        (this.step <= 2 ? today(current) : '') +
+        (this.step <= 2 ? ' vis-' + current.format('dddd').toLowerCase() : '' + even(current.date() - 1));
 
     case 'month':
       return 'vis-' + current.format('MMMM').toLowerCase() +