diff --git a/cake/libs/cake_socket.php b/cake/libs/cake_socket.php
index 612d42e2126..531c3b43ae1 100644
--- a/cake/libs/cake_socket.php
+++ b/cake/libs/cake_socket.php
@@ -138,9 +138,8 @@ public function connect() {
 	public function host() {
 		if (Validation::ip($this->config['host'])) {
 			return gethostbyaddr($this->config['host']);
-		} else {
-			return gethostbyaddr($this->address());
 		}
+		return gethostbyaddr($this->address());
 	}
 
 /**
@@ -151,9 +150,8 @@ public function host() {
 	public function address() {
 		if (Validation::ip($this->config['host'])) {
 			return $this->config['host'];
-		} else {
-			return gethostbyname($this->config['host']);
 		}
+		return gethostbyname($this->config['host']);
 	}
 
 /**
@@ -164,9 +162,8 @@ public function address() {
 	public function addresses() {
 		if (Validation::ip($this->config['host'])) {
 			return array($this->config['host']);
-		} else {
-			return gethostbynamel($this->config['host']);
 		}
+		return gethostbynamel($this->config['host']);
 	}
 
 /**
@@ -177,9 +174,8 @@ public function addresses() {
 	public function lastError() {
 		if (!empty($this->lastError)) {
 			return $this->lastError['num'] . ': ' . $this->lastError['str'];
-		} else {
-			return null;
 		}
+		return null;
 	}
 
 /**
@@ -187,6 +183,7 @@ public function lastError() {
  *
  * @param integer $errNum Error code
  * @param string $errStr Error string
+ * @return void
  */
 	public function setLastError($errNum, $errStr) {
 		$this->lastError = array('num' => $errNum, 'str' => $errStr);
@@ -230,17 +227,8 @@ public function read($length = 1024) {
 				return false;
 			}
 			return $buffer;
-		} else {
-			return false;
 		}
-	}
-
-/**
- * Abort socket operation.
- *
- * @return boolean Success
- */
-	public function abort() {
+		return false;
 	}
 
 /**
@@ -273,6 +261,7 @@ function __destruct() {
 /**
  * Resets the state of this Socket instance to it's initial state (before Object::__construct got executed)
  *
+ * @param array $state Array with key and values to reset
  * @return boolean True on success
  */
 	public function reset($state = null) {