diff --git a/core/Callbacks/Structures/ArmorEmptyStructure.php b/core/Callbacks/Structures/ArmorEmptyStructure.php
index 09108816..325b4aa8 100644
--- a/core/Callbacks/Structures/ArmorEmptyStructure.php
+++ b/core/Callbacks/Structures/ArmorEmptyStructure.php
@@ -4,7 +4,13 @@ namespace ManiaControl\Callbacks\Structures;
 
 use ManiaControl\ManiaControl;
 use ManiaControl\Players\Player;
-
+/**
+ * Structure Class for the ArmorEmpty Callback
+ *
+ * @author    ManiaControl Team <mail@maniacontrol.com>
+ * @copyright 2014-2015 ManiaControl Team
+ * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
+ */
 class ArmorEmptyStructure {
 	/*
 	 * Private properties
diff --git a/core/Callbacks/Structures/CaptureStructure.php b/core/Callbacks/Structures/CaptureStructure.php
index 12a853c0..88bb0d9f 100644
--- a/core/Callbacks/Structures/CaptureStructure.php
+++ b/core/Callbacks/Structures/CaptureStructure.php
@@ -5,6 +5,13 @@ namespace ManiaControl\Callbacks\Structures;
 use ManiaControl\ManiaControl;
 use ManiaControl\Players\Player;
 
+/**
+ * Structure Class for the Capture Callback
+ *
+ * @author    ManiaControl Team <mail@maniacontrol.com>
+ * @copyright 2014-2015 ManiaControl Team
+ * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
+ */
 class CaptureStructure {
 	/*
 	 * Private properties
@@ -42,7 +49,7 @@ class CaptureStructure {
 		$playerArray = array();
 		foreach ($this->playerArray as $login) {
 			$player = $this->maniaControl->getPlayerManager()->getPlayer($login);
-			if($player){
+			if ($player) {
 				$playerArray[$login] = $player;
 			}
 		}
diff --git a/core/Callbacks/Structures/EliteBeginTurnStructure.php b/core/Callbacks/Structures/EliteBeginTurnStructure.php
index ffe5f787..f4b9ba14 100644
--- a/core/Callbacks/Structures/EliteBeginTurnStructure.php
+++ b/core/Callbacks/Structures/EliteBeginTurnStructure.php
@@ -5,6 +5,13 @@ namespace ManiaControl\Callbacks\Structures;
 use ManiaControl\ManiaControl;
 use ManiaControl\Players\Player;
 
+/**
+ * Structure Class for the EliteBeginTurn Callback
+ *
+ * @author    ManiaControl Team <mail@maniacontrol.com>
+ * @copyright 2014-2015 ManiaControl Team
+ * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
+ */
 class EliteBeginTurnStructure {
 	/*
 	 * Private properties
@@ -22,8 +29,8 @@ class EliteBeginTurnStructure {
 	 * @param array        $data
 	 */
 	public function __construct(ManiaControl $maniaControl, array $data) {
-		$this->maniaControl    = $maniaControl;
-		$this->attackerLogin   = $data[0];
+		$this->maniaControl   = $maniaControl;
+		$this->attackerLogin  = $data[0];
 		$this->defenderLogins = $data[1];
 	}
 
diff --git a/core/Callbacks/Structures/NearMissStructure.php b/core/Callbacks/Structures/NearMissStructure.php
index fe9cad94..bd9e8703 100644
--- a/core/Callbacks/Structures/NearMissStructure.php
+++ b/core/Callbacks/Structures/NearMissStructure.php
@@ -5,6 +5,13 @@ namespace ManiaControl\Callbacks\Structures;
 use ManiaControl\ManiaControl;
 use ManiaControl\Players\Player;
 
+/**
+ * Structure Class for the NearMiss Callback
+ *
+ * @author    ManiaControl Team <mail@maniacontrol.com>
+ * @copyright 2014-2015 ManiaControl Team
+ * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
+ */
 class NearMissStructure {
 	/*
 	 * Private properties
diff --git a/core/Callbacks/Structures/PlayerHitStructure.php b/core/Callbacks/Structures/PlayerHitStructure.php
index ae739a5b..be6d7018 100644
--- a/core/Callbacks/Structures/PlayerHitStructure.php
+++ b/core/Callbacks/Structures/PlayerHitStructure.php
@@ -1,16 +1,17 @@
 <?php
-/**
- * Player Hit Structure
- *
- * @author    ManiaControl Team <mail@maniacontrol.com>
- * @copyright 2014-2015 ManiaControl Team
- * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
- */
+
 namespace ManiaControl\Callbacks\Structures;
 
 use ManiaControl\ManiaControl;
 use ManiaControl\Players\Player;
 
+/**
+ * Structure Class for the Player Hit Callback
+ *
+ * @author    ManiaControl Team <mail@maniacontrol.com>
+ * @copyright 2014-2015 ManiaControl Team
+ * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
+ */
 class PlayerHitStructure {
 	/*
 	 * Private properties
@@ -38,7 +39,7 @@ class PlayerHitStructure {
 		$this->damage        = $data[2];
 		$this->weapon        = $data[3];
 		$this->shooterPoints = $data[4];
-		
+
 		//TODO remove key check in some months (hitDistance got implemented 2014-10-16)
 		if (array_key_exists(5, $data)) {
 			$this->hitDistance = $data[5];