diff --git a/scripts/play.php b/scripts/play.php
index 17820a9..6f48ae5 100644
--- a/scripts/play.php
+++ b/scripts/play.php
@@ -419,20 +419,8 @@ if(!isset($_GET['species']) && !isset($_GET['filename'])){
     $values = array();
     while($results=$result->fetchArray(SQLITE3_ASSOC))
     {
-      $name = $results['Com_Name'];
-      $birds[] = $name;
-      if ($_GET['sort'] == "confidence") {
-            $values[] = ' (' . round($results['MaxConfidence'] * 100) . '%)';
-      } elseif ($_GET['sort'] == "occurrences") {
-	    $valuescount = $results['Count'];
-            if ($valuescount >= 1000) {
-                $values[] = ' (' . round($valuescount / 1000, 1) . 'k)';
-            } else {
-                $values[] = ' (' . $valuescount . ')';
-            }
-      } elseif ($_GET['sort'] == "date") {
-            $values[] = ' (' . $results['Date'] . ')';
-      }
+      $birds[] = $results['Sci_Name'];
+      $values[] = get_label($results, $_GET['sort']);
     }
 
     if(count($birds) > 45) {
@@ -451,7 +439,7 @@ if(!isset($_GET['species']) && !isset($_GET['filename'])){
         if ($index < count($birds)) {
           ?>
           <td class="spec">
-              <button type="submit" name="species" value="<?php echo $birds[$index];?>"><?php echo $birds[$index].$values[$index];?></button>
+              <button type="submit" name="species" value="<?php echo $birds[$index];?>"><?php echo $values[$index];?></button>
           </td>
           <?php
         } else {
@@ -466,20 +454,10 @@ if(!isset($_GET['species']) && !isset($_GET['filename'])){
     $values = array();
 while($results=$result->fetchArray(SQLITE3_ASSOC))
 {
-  $name = $results['Com_Name'];
-  $dir_name = str_replace("'", '', $name);
+  $dir_name = str_replace("'", '', $results['Com_Name']);
   if(realpath($home."/BirdSongs/Extracted/By_Date/".$date."/".str_replace(" ", "_", $dir_name)) !== false){
-    $birds[] = $name;
-    if ($_GET['sort'] == "confidence") {
-        $values[] = ' (' . round($results['MaxConfidence'] * 100) . '%)';
-    } elseif ($_GET['sort'] == "occurrences") {
-	$valuescount = $results['Count'];
-        if ($valuescount >= 1000) {
-            $values[] = ' (' . round($valuescount / 1000, 1) . 'k)';
-        } else {
-            $values[] = ' (' . $valuescount . ')';
-        }
-    }
+    $birds[] = $results['Sci_Name'];
+    $values[] = get_label($results, $_GET['sort'], $_GET['date']);
   }
 }
 
@@ -499,7 +477,7 @@ for ($row = 0; $row < $num_rows; $row++) {
     if ($index < count($birds)) {
       ?>
       <td class="spec">
-          <button type="submit" name="species" value="<?php echo $birds[$index];?>"><?php echo $birds[$index].$values[$index];?></button>
+          <button type="submit" name="species" value="<?php echo $birds[$index];?>"><?php echo $values[$index];?></button>
       </td>
       <?php
     } else {
diff --git a/scripts/stats.php b/scripts/stats.php
index 5ead68a..b3f536d 100644
--- a/scripts/stats.php
+++ b/scripts/stats.php
@@ -64,18 +64,7 @@ if (get_included_files()[0] === __FILE__) {
     $comname = preg_replace('/\'/', '', $comname);
     $filename = "/By_Date/".$results['Date']."/".$comname."/".$results['File_Name'];
     $birds[] = $results['Com_Name'];
-    if ($_GET['sort'] == "confidence") {
-        $values[] = ' (' . round($results['MaxConfidence'] * 100) . '%)';
-    } elseif ($_GET['sort'] == "occurrences") {
-        $valuescount = $results['Count'];
-        if ($valuescount >= 1000) {
-            $values[] = ' (' . round($valuescount / 1000, 1) . 'k)';
-        } else {
-            $values[] = ' (' . $valuescount . ')';
-        }
-    } elseif ($_GET['sort'] == "date") {
-        $values[] = ' (' . $results['Date'] . ')';
-    }
+    $values[] = get_label($results, $_GET['sort']);
   }
 
   if(count($birds) > 45) {
@@ -94,7 +83,7 @@ if (get_included_files()[0] === __FILE__) {
       if ($index < count($birds)) {
         ?>
         <td>
-            <button type="submit" name="species" value="<?php echo $birds[$index];?>"><?php echo $birds[$index].$values[$index];?></button>
+            <button type="submit" name="species" value="<?php echo $birds[$index];?>"><?php echo $values[$index];?></button>
         </td>
         <?php
       } else {