Index: office_hours.theme.inc
===================================================================
--- office_hours.theme.inc	(revision 90)
+++ office_hours.theme.inc	(working copy)
@@ -5,13 +5,13 @@
  */
 
 function office_hours_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
-	$element = array();
-	$settings = $display['settings'];
-	$formatter = $display['type'];
-	$element[0] = array(
-		'#markup' => theme($display['type'].'_formatter_default', array('element' => $items, 'field' => $instance)),
-		);
-	return $element;
+  $element = array();
+  $settings = $display['settings'];
+  $formatter = $display['type'];
+  $element[0] = array(
+    '#markup' => theme($display['type'].'_formatter_default', array('element' => $items, 'field' => $instance)),
+    );
+  return $element;
 }
 
 /**
@@ -39,22 +39,25 @@
   }
   
   $keys = array_keys($items);
-  if ((!empty($keys)) && $keys[0] != $days[$first] && in_array(t($days[$first]), $items) )
-   while ($keys[0] != $days[$first] && count($keys)>1):   
-    $shifted = array_shift($items);
-    $items[$keys[0]] = $shifted;
-    $keys = array_keys($items);
-  endwhile;
+  if ((!empty($keys)) && $keys[0] != $days[$first] && in_array(t($days[$first]), $items) ) { 
+    while ($keys[0] != $days[$first] && count($keys)>1):   
+      $shifted = array_shift($items);
+      $items[$keys[0]] = $shifted;
+      $keys = array_keys($items);
+    endwhile;
   }
   
   foreach ($items as $day => $val) {
     $strhrs = $val[0]['strhrs'];
     $endhrs = $val[0]['endhrs'];
-	if (isset($val[1])) {
-    $strhrs2 = $val[1]['strhrs'];
-    $endhrs2 = $val[1]['endhrs'];
-    $additional =  ' <span class="oh-display-hours">, '.$strhrs2.' - '.$endhrs2.'</span>';
-	} else $additional = '';
+    if (isset($val[1])) {
+      $strhrs2 = $val[1]['strhrs'];
+      $endhrs2 = $val[1]['endhrs'];
+      $additional =  ' <span class="oh-display-hours">, '.$strhrs2.' - '.$endhrs2.'</span>';
+    } 
+    else {
+      $additional = '';
+    }
     $output .= '<div class="oh-display">'.$day.': <span class="oh-display-hours">'.$strhrs.' - '.$endhrs.'</span>'.$additional.'</div>';  
   }
   return $output;     
@@ -101,7 +104,7 @@
          $items[] = &$element[$key];
       }
     }
-  // dpm($items);
+
     $items = _office_hours_arrange_day($items); //this calls the function that arranges the first day of the week.
     // Add the items as table rows.
     foreach ($items as $key => $item) {
@@ -131,7 +134,6 @@
       $output .= theme_office_hours_multiple_values(array('element' => $element[$value]));
     }
   }
-  
+
   return $output;
-  
-}
+}
\ No newline at end of file