diff --git a/application/core/Callbacks/TimerManager.php b/application/core/Callbacks/TimerManager.php
index cbbb8011..15136543 100644
--- a/application/core/Callbacks/TimerManager.php
+++ b/application/core/Callbacks/TimerManager.php
@@ -49,6 +49,7 @@ class TimerManager {
 		}
 
 		//Init the Timer Listening
+		// TODO: extra model class
 		$listening              = new \stdClass();
 		$listening->listener    = $listener;
 		$listening->method      = $method;
diff --git a/application/core/Statistics/StatisticManager.php b/application/core/Statistics/StatisticManager.php
index e52a9716..f5749c3f 100644
--- a/application/core/Statistics/StatisticManager.php
+++ b/application/core/Statistics/StatisticManager.php
@@ -282,6 +282,9 @@ class StatisticManager {
 			$this->stats[$row->name] = $row;
 		}
 		$result->close();
+		
+		// TODO: own model class
+		
 		//Define Special Stat Kill / Death Ratio
 		$stat                                            = new \stdClass();
 		$stat->name                                      = self::SPECIAL_STAT_KD_RATIO;
@@ -300,7 +303,7 @@ class StatisticManager {
 		$stat->type                                       = self::STAT_TYPE_FLOAT;
 		$this->specialStats[self::SPECIAL_STAT_LASER_ACC] = $stat;
 
-		//Nuceleus Accuracy
+		//Nucleus Accuracy
 		$stat                                               = new \stdClass();
 		$stat->name                                         = self::SPECIAL_STAT_NUCLEUS_ACC;
 		$stat->type                                         = self::STAT_TYPE_FLOAT;