diff --git a/app/tasks/usage.php b/app/tasks/usage.php
index 1fc1db5922..d3b29e3b38 100644
--- a/app/tasks/usage.php
+++ b/app/tasks/usage.php
@@ -114,6 +114,44 @@ $logError = function (Throwable $error, string $action = 'syncUsageStats') use (
     Console::warning($error->getTraceAsString());
 };
 
+
+function aggregateTimeseries(UtopiaDatabase $database, InfluxDatabase $influxDB, callable $logError): void
+{
+    $interval = (int) App::getEnv('_APP_USAGE_TIMESERIES_INTERVAL', '30'); // 30 seconds (by default)
+    $usage = new TimeSeries($database, $influxDB, $logError);
+
+    Console::loop(function () use ($interval, $usage) {
+        $now = date('d-m-Y H:i:s', time());
+        Console::info("[{$now}] Aggregating Timeseries Usage data every {$interval} seconds");
+        $loopStart = microtime(true);
+
+        $usage->collect();
+
+        $loopTook = microtime(true) - $loopStart;
+        $now = date('d-m-Y H:i:s', time());
+        Console::info("[{$now}] Aggregation took {$loopTook} seconds");
+    }, $interval);
+}
+
+function aggregateDatabase(UtopiaDatabase $database, callable $logError): void
+{
+    $interval = (int) App::getEnv('_APP_USAGE_DATABASE_INTERVAL', '900'); // 15 minutes (by default)
+    $usage = new Database($database, $logError);
+    $aggregrator = new Aggregator($database, $logError);
+
+    Console::loop(function () use ($interval, $usage, $aggregrator) {
+        $now = date('d-m-Y H:i:s', time());
+        Console::info("[{$now}] Aggregating database usage every {$interval} seconds.");
+        $loopStart = microtime(true);
+        $usage->collect();
+        $aggregrator->collect();
+        $loopTook = microtime(true) - $loopStart;
+        $now = date('d-m-Y H:i:s', time());
+
+        Console::info("[{$now}] Aggregation took {$loopTook} seconds");
+    }, $interval);
+}
+
 $cli
     ->task('usage')
     ->param('type', 'timeseries', new WhiteList(['timeseries', 'database']))
@@ -125,38 +163,14 @@ $cli
         $database = getDatabase($register, '_console');
         $influxDB = getInfluxDB($register);
 
-        if ($type == 'timeseries') {
-            $interval = (int) App::getEnv('_APP_USAGE_TIMESERIES_INTERVAL', '30'); // 30 seconds (by default)
-            $usage = new TimeSeries($database, $influxDB, $logError);
-
-            Console::loop(function () use ($interval, $usage) {
-                $now = date('d-m-Y H:i:s', time());
-                Console::info("[{$now}] Aggregating Timeseries Usage data every {$interval} seconds");
-                $loopStart = microtime(true);
-
-                $usage->collect();
-
-                $loopTook = microtime(true) - $loopStart;
-                $now = date('d-m-Y H:i:s', time());
-                Console::info("[{$now}] Aggregation took {$loopTook} seconds");
-            }, $interval);
-        }
-
-        if ($type == 'database') {
-            $interval = (int) App::getEnv('_APP_USAGE_DATABASE_INTERVAL', '900'); // 15 minutes (by default)
-            $usage = new Database($database, $logError);
-            $aggregrator = new Aggregator($database, $logError);
-
-            Console::loop(function () use ($interval, $usage, $aggregrator) {
-                $now = date('d-m-Y H:i:s', time());
-                Console::info("[{$now}] Aggregating database usage every {$interval} seconds.");
-                $loopStart = microtime(true);
-                $usage->collect();
-                $aggregrator->collect();
-                $loopTook = microtime(true) - $loopStart;
-                $now = date('d-m-Y H:i:s', time());
-
-                Console::info("[{$now}] Aggregation took {$loopTook} seconds");
-            }, $interval);
+        switch($type) {
+            case 'timeseries':
+                aggregateTimeseries($database, $influxDB, $logError);
+                break;
+            case 'database':
+                aggregateDatabase($database, $logError);
+                break;
+            default:
+                Console::error("Unsupported usage aggregation type");
         }
     });