diff --git a/lib/Stats/Collector/BaseCollector.php b/lib/Stats/Collector/BaseCollector.php
index ac96db2717f25f1b4161e7023f0dc32805fc5d82..816a97807327e46853d54ab7444f8baafd23a0de 100644
--- a/lib/Stats/Collector/BaseCollector.php
+++ b/lib/Stats/Collector/BaseCollector.php
@@ -11,6 +11,8 @@ use OCP\IDBConnection;
 
 abstract class BaseCollector implements ICollector {
 	const RETRY_TIMES = 3;
+	const STATE_ENABLED = 'true';
+	const STATE_DISABLED = 'false';
 
 	public function collect(IDBConnection $db, int $timestamp, int $chunkSize, ConfigService $config) {
 		$data = null;
diff --git a/lib/Stats/Collector/FileTypesCountsCollector.php b/lib/Stats/Collector/FileTypesCountsCollector.php
index c7afe6372e42effb940b47ee2f8d8f8052973826..8315d0db39a9da7bb3dc65e3ad52ffac7955bf3b 100644
--- a/lib/Stats/Collector/FileTypesCountsCollector.php
+++ b/lib/Stats/Collector/FileTypesCountsCollector.php
@@ -10,7 +10,7 @@ use OCP\IDBConnection;
 class FileTypesCountsCollector extends BaseCollector {
     protected function collectData(IDBConnection $db, int $timestamp, int $chunkSize, ConfigService $config) {
         $fileCounts = [];
-        $mapper = new FilecacheMapper($db, $chunkSize, $config->getSnapshotFiletypesFilterClosedAccounts() ? '1' : 0);
+        $mapper = new FilecacheMapper($db, $chunkSize, $config->getSnapshotFiletypesFilterClosedAccounts() ? self::STATE_ENABLED : 0);
 	    $counts = $mapper->queryFiletypesCounts();
 	    foreach ($config->getSnapshotFileTypes()->groups() as $groupName => $group) {
 		    if (!$group->isCollectEnabled()) {
diff --git a/lib/Stats/Collector/FilesCountCollector.php b/lib/Stats/Collector/FilesCountCollector.php
index cce8364c07c25b2bd96ae976f77a11710d6ecaa0..6879afe3cb7b13919d31fb6e20cb040eaa078699 100644
--- a/lib/Stats/Collector/FilesCountCollector.php
+++ b/lib/Stats/Collector/FilesCountCollector.php
@@ -13,7 +13,7 @@ class FilesCountCollector extends BaseCollector {
     protected function collectData(IDBConnection $db, int $timestamp, int $chunkSize, ConfigService $config) {
         $mapper = new FilecacheMapper($db, $chunkSize);
 		$totalCount = $mapper->queryTotalFilesCount();
-		$mapper->setAccountsState(0); # disabled
+		$mapper->setAccountsState(self::STATE_DISABLED);
 	    $obsoleteCount = $mapper->queryTotalFilesCount();
         return [
 			FilesCountValue::TOTAL_COUNT => $totalCount,
diff --git a/lib/Stats/Collector/FilesSizeCollector.php b/lib/Stats/Collector/FilesSizeCollector.php
index e871ea3e319abbddf53e86adf84e314fb70f2065..e0340dd6d65b87d9e2d1e7187f0785c9d4d3df3e 100644
--- a/lib/Stats/Collector/FilesSizeCollector.php
+++ b/lib/Stats/Collector/FilesSizeCollector.php
@@ -13,7 +13,7 @@ class FilesSizeCollector extends BaseCollector {
     protected function collectData(IDBConnection $db, int $timestamp, int $chunkSize, ConfigService $config) {
         $mapper = new FilecacheMapper($db, $chunkSize);
 	    $totalCount = $mapper->queryTotalFilesSize();
-	    $mapper->setAccountsState(0); #disabled
+	    $mapper->setAccountsState(self::STATE_DISABLED);
 	    $obsoleteCount = $mapper->queryTotalFilesSize();
 	    return [
 		    FilesSizeValue::TOTAL_SIZE => $totalCount,
diff --git a/lib/Stats/Collector/UsersCountCollector.php b/lib/Stats/Collector/UsersCountCollector.php
index c335cf344fa0c60bee68f41260cf4cf4a53ff787..3dc8361790cf020465b76afe715a2383ebea3490 100644
--- a/lib/Stats/Collector/UsersCountCollector.php
+++ b/lib/Stats/Collector/UsersCountCollector.php
@@ -12,8 +12,8 @@ use OCP\IDBConnection;
 class UsersCountCollector extends BaseCollector {
     protected function collectData(IDBConnection $db, int $timestamp, int $chunkSize, ConfigService $config): array {
         $mapper = new PreferencesMapper($db, $chunkSize);
-		$activeUsers = $mapper->queryTotalCount('true');
-		$closedUsers = $mapper->queryTotalCount('false');
+		$activeUsers = $mapper->queryTotalCount(self::STATE_ENABLED);
+		$closedUsers = $mapper->queryTotalCount(self::STATE_DISABLED);
         $values = [UsersCountValue::TOTAL_COUNT => $activeUsers + $closedUsers, UsersCountValue::CLOSED_COUNT => $closedUsers];
         foreach (TimePeriods::periods() as $k => $period) {
             $values[$k] = $mapper->queryActiveCount($period->before($timestamp));