diff --git a/application/core/Admin/AdminLists.php b/application/core/Admin/AdminLists.php
index b76be812..a40cb7be 100644
--- a/application/core/Admin/AdminLists.php
+++ b/application/core/Admin/AdminLists.php
@@ -28,9 +28,9 @@ class AdminLists implements ManialinkPageAnswerListener, CallbackListener {
 	/*
 	 * Constants
 	 */
-	const ACTION_OPEN_ADMINLISTS = "AdminList.OpenAdminLists";
-	const ACTION_REVOKE_RIGHTS   = "AdminList.RevokeRights";
-	const MAX_PLAYERS_PER_PAGE   = 15;
+	const ACTION_OPEN_ADMINLIST = 'AdminList.OpenAdminList';
+	const ACTION_REVOKE_RIGHTS  = 'AdminList.RevokeRights';
+	const MAX_PLAYERS_PER_PAGE  = 15;
 
 	/*
 	 * Private Properties
@@ -51,10 +51,10 @@ class AdminLists implements ManialinkPageAnswerListener, CallbackListener {
 		$this->maniaControl->callbackManager->registerCallbackListener(AuthenticationManager::CB_AUTH_LEVEL_CHANGED, $this, 'updateWidget');
 
 		// Menu Entry AdminList
-		$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_OPEN_ADMINLISTS, $this, 'openAdminList');
+		$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_OPEN_ADMINLIST, $this, 'openAdminList');
 		$itemQuad = new Quad_UIConstruction_Buttons();
 		$itemQuad->setSubStyle($itemQuad::SUBSTYLE_Author);
-		$itemQuad->setAction(self::ACTION_OPEN_ADMINLISTS);
+		$itemQuad->setAction(self::ACTION_OPEN_ADMINLIST);
 		$this->maniaControl->actionsMenu->addMenuItem($itemQuad, false, 50, 'Open AdminList');
 	}
 
diff --git a/application/core/Callbacks/Models/BaseCallback.php b/application/core/Callbacks/Models/BaseCallback.php
index d54fd393..fc8a94f0 100644
--- a/application/core/Callbacks/Models/BaseCallback.php
+++ b/application/core/Callbacks/Models/BaseCallback.php
@@ -21,6 +21,7 @@ abstract class BaseCallback {
 
 	public $pid = null;
 	public $login = null;
+	/** @var Player $player */
 	public $player = null;
 
 	/**
diff --git a/application/core/ColorUtil.php b/application/core/ColorUtil.php
index 8e3ac196..451506ed 100644
--- a/application/core/ColorUtil.php
+++ b/application/core/ColorUtil.php
@@ -29,8 +29,8 @@ abstract class ColorUtil {
 		if ($value > 0.5) {
 			$red = 2. * (1. - $value);
 		}
-		$red   = ColorUtil::floatToCode($red);
-		$green = ColorUtil::floatToCode($green);
+		$red   = self::floatToCode($red);
+		$green = self::floatToCode($green);
 		return $red . $green . '0';
 	}
 
diff --git a/application/core/Maps/MapList.php b/application/core/Maps/MapList.php
index 74001f61..ce8298c3 100644
--- a/application/core/Maps/MapList.php
+++ b/application/core/Maps/MapList.php
@@ -314,7 +314,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 				$label->setText($queuedMaps[$map->uid]);
 				$label->setTextColor('fff');
 
-				// Checks if the Player who openend the Widget has queued the map
+				// Checks if the Player who opened the Widget has queued the map
 				$queuer = $this->maniaControl->mapManager->mapQueue->getQueuer($map->uid);
 				if ($queuer->login == $player->login) {
 					$description = 'Remove $<' . $map->name . '$> from the Map Queue';
diff --git a/application/plugins/MCTeam/CustomVotesPlugin.php b/application/plugins/MCTeam/CustomVotesPlugin.php
index 8d3c6ec5..db7242bf 100644
--- a/application/plugins/MCTeam/CustomVotesPlugin.php
+++ b/application/plugins/MCTeam/CustomVotesPlugin.php
@@ -242,7 +242,7 @@ class CustomVotesPlugin implements CommandListener, CallbackListener, ManialinkP
 		$itemQuad = new Quad_Icons64x64_1();
 		$itemQuad->setSubStyle($itemQuad::SUBSTYLE_ArrowFastNext);
 		$itemQuad->setAction(self::ACTION_START_VOTE . 'skipmap');
-		$this->addVoteMenuItem($itemQuad, 15, 'Vote for a Mapskip');
+		$this->addVoteMenuItem($itemQuad, 15, 'Vote for a Map Skip');
 
 		if ($this->maniaControl->server->isTeamMode()) {
 			//Menu TeamBalance