diff --git a/Classes/Client/BotClient.php b/Classes/Client/BotClient.php
index 5f9755c..8e69404 100644
--- a/Classes/Client/BotClient.php
+++ b/Classes/Client/BotClient.php
@@ -9,6 +9,7 @@ class Client_BotClient extends Client_AbstractClient {
 
 	/**
 	 * Default constructor.
+	 * @return void
 	 */
 	public function __construct() {
 
diff --git a/Classes/Client/ClientManager.php b/Classes/Client/ClientManager.php
index 9eaf70a..ddb5105 100644
--- a/Classes/Client/ClientManager.php
+++ b/Classes/Client/ClientManager.php
@@ -143,6 +143,7 @@ class Client_ClientManager {
 	/**
 	 * Closes and removes the connection.
 	 * @param Connection_ConnectionHandler $connectionHandler
+	 * @return void
 	 */
 	public function removeConnection($connectionHandler) {
 		unset($this->configPool[$connectionHandler->getID()]);
diff --git a/Classes/Connection/ConnectionHandler.php b/Classes/Connection/ConnectionHandler.php
index d99b29c..0f8f299 100644
--- a/Classes/Connection/ConnectionHandler.php
+++ b/Classes/Connection/ConnectionHandler.php
@@ -112,6 +112,7 @@ class Connection_ConnectionHandler {
 	/**
 	 * Injector for the internal ConnectionPool access.
 	 * @param Connection_ConnectionPool $connectionPool
+	 * @return void
 	 */
 	public function injectConnectionPool($connectionPool) {
 		$this->connectionPool = $connectionPool;
@@ -149,6 +150,7 @@ class Connection_ConnectionHandler {
 	/**
 	 * Sets the IPv6-flag.
 	 * @param boolean $IPv6
+	 * @return void
 	 */
 	public function setIPv6($IPv6) {
 		$this->IPv6 = $IPv6;
@@ -157,6 +159,7 @@ class Connection_ConnectionHandler {
 	/**
 	 * Sets reconnect_on_disconnect flag.
 	 * @param boolean $reconnect
+	 * @return void
 	 */
 	public function setReconnect($reconnect) {
 		$this->reconnect_on_disconnect = $reconnect;
diff --git a/Classes/Connection/ConnectionPool.php b/Classes/Connection/ConnectionPool.php
index eb66cb2..e8d5e97 100644
--- a/Classes/Connection/ConnectionPool.php
+++ b/Classes/Connection/ConnectionPool.php
@@ -164,6 +164,7 @@ class Connection_ConnectionPool {
 	 * Writes the given data to the socket with $id.
 	 * @param int $id
 	 * @param string $data
+	 * @return void
 	 */
 	public function writeToID($id, $data) {
 		foreach($this->connectionHandlers AS $connectionHandler) {
diff --git a/Classes/Exception/GeneralException.php b/Classes/Exception/GeneralException.php
index 90da108..60e2f1f 100644
--- a/Classes/Exception/GeneralException.php
+++ b/Classes/Exception/GeneralException.php
@@ -12,6 +12,7 @@ class Exception_GeneralException extends Exception {
 	 * @throws UnknownException
 	 * @param string $message
 	 * @param int $code
+	 * @return void
 	 */
 	public function __construct($message = "", $code = 0) {
 		if ($message === "") {
diff --git a/Classes/Protocol/AbstractProtocolHandler.php b/Classes/Protocol/AbstractProtocolHandler.php
index 98c325f..b48fc75 100644
--- a/Classes/Protocol/AbstractProtocolHandler.php
+++ b/Classes/Protocol/AbstractProtocolHandler.php
@@ -58,6 +58,7 @@ abstract class Protocol_AbstractProtocolHandler {
 	/**
 	 * Adds the incoming data to the internal buffer.
 	 * @param string $rawData
+	 * @return void
 	 */
 	public function pushRawData($rawData) {
 		$this->buffer_incoming->addData($rawData);
diff --git a/Classes/Protocol/BotProtocolContentObject.php b/Classes/Protocol/BotProtocolContentObject.php
index 62cb46d..ba25f3d 100644
--- a/Classes/Protocol/BotProtocolContentObject.php
+++ b/Classes/Protocol/BotProtocolContentObject.php
@@ -4,7 +4,5 @@
  * @author JPT
  * @package Protocol
  */
-class Protocol_BotProtocolContentObject extends Protocol_AbstractProtocolContentObject {
-
-}
+class Protocol_BotProtocolContentObject extends Protocol_AbstractProtocolContentObject {}
 ?>
\ No newline at end of file
diff --git a/Classes/Protocol/IrcProtocolHandler.php b/Classes/Protocol/IrcProtocolHandler.php
index 747e85a..ff97151 100644
--- a/Classes/Protocol/IrcProtocolHandler.php
+++ b/Classes/Protocol/IrcProtocolHandler.php
@@ -187,6 +187,5 @@ class Protocol_IrcProtocolHandler extends Protocol_AbstractProtocolHandler {
 		$this->sendRaw("PONG :" . $param);
 	}
 
-
 }
 ?>
\ No newline at end of file
diff --git a/Classes/Protocol/RawProtocolContentObject.php b/Classes/Protocol/RawProtocolContentObject.php
index ae6f582..30c5c0f 100644
--- a/Classes/Protocol/RawProtocolContentObject.php
+++ b/Classes/Protocol/RawProtocolContentObject.php
@@ -4,7 +4,5 @@
  * @author JPT
  * @package Protocol
  */
-class Protocol_RawProtocolContentObject extends Protocol_AbstractProtocolContentObject {
-
-}
+class Protocol_RawProtocolContentObject extends Protocol_AbstractProtocolContentObject {}
 ?>
\ No newline at end of file
diff --git a/Classes/Socket/SocketHandler.php b/Classes/Socket/SocketHandler.php
index a041596..1f1ec72 100644
--- a/Classes/Socket/SocketHandler.php
+++ b/Classes/Socket/SocketHandler.php
@@ -213,6 +213,7 @@ class Socket_SocketHandler {
 	/**
 	 * Gets last error from socket.
 	 * @throws Exception_SocketException
+	 * @return void
 	 */
 	protected function error() {
 		if(is_resource($this->socket) === FALSE) throw new Exception_SocketException("No socket resource available!", 1290954177);