diff --git a/clock.tokens.inc b/clock.tokens.inc
index 2c799a8..110dbc2 100644
--- a/clock.tokens.inc
+++ b/clock.tokens.inc
@@ -25,7 +25,7 @@ function clock_token_info() {
         ),
         'time-zone' => array(
           'name' => t('Clock time zone'),
-          'description' => t('The time zone of the clock.'), 
+          'description' => t('The time zone of the clock.'),
         ),
         'date-type' => array(
           'name' => t('Clock date type'),
@@ -35,7 +35,7 @@ function clock_token_info() {
           'name' => t('Clock ID'),
           'description' => t('A unique identifier for this clock.'),
         ),
-      ),    
+      ),
     ),
   );
   return $info;
@@ -46,7 +46,7 @@ function clock_token_info() {
  */
 function clock_tokens($type, $tokens, $data, $options) {
   $replacements = array();
-  if ($type = 'clock') {
+  if ($type == 'clock') {
     $clock = $data['clock'];
     foreach ($tokens as $name => $original) {
       switch ($name) {
@@ -58,6 +58,7 @@ function clock_tokens($type, $tokens, $data, $options) {
           break;
         case 'date-type':
           $replacements[$original] = $clock->date_type;
+          break;
         case 'cid':
           $replacements[$original] = $clock->cid;
           break;