diff --git a/lib/private/avatar.php b/lib/private/avatar.php
index e82e517b09..814a9b22be 100644
--- a/lib/private/avatar.php
+++ b/lib/private/avatar.php
@@ -54,7 +54,9 @@ class OC_Avatar implements \OCP\IAvatar {
 
 		$img = new OC_Image($data);
 		$type = substr($img->mimeType(), -3);
-		if ($type === 'peg') { $type = 'jpg'; }
+		if ($type === 'peg') {
+			$type = 'jpg';
+		}
 		if ($type !== 'jpg' && $type !== 'png') {
 			$l = \OC_L10N::get('lib');
 			throw new \Exception($l->t("Unknown filetype"));
diff --git a/lib/private/server.php b/lib/private/server.php
index 7711269acf..77c3732a9c 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -132,7 +132,7 @@ class Server extends SimpleContainer implements IServerContainer {
 			return new ActivityManager();
 		});
 		$this->registerService('AvatarManager', function($c) {
-			return new AvatarManager(); //TODO AvatarManager needs $user
+			return new AvatarManager();
 		});
 	}
 
@@ -176,7 +176,7 @@ class Server extends SimpleContainer implements IServerContainer {
 	/**
 	 * Returns the avatar manager, used for avatar functionality
 	 *
-	 * @return \OCP\IAvatar
+	 * @return \OCP\IAvatarManager
 	 */
 	function getAvatarManager() {
 		return $this->query('AvatarManager');
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 6556b52c3b..36296a5985 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -156,7 +156,7 @@ interface IServerContainer {
 
 	/**
 	 * @brief Returns an avatar manager, used for avatar functionality
-	 * @return \OCP\IAvatar
+	 * @return \OCP\IAvatarManager
 	 */
 	function getAvatarManager();