diff --git a/mod/poco.php b/mod/poco.php
index 7dcf3b4a02..97f518a1a5 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -1,15 +1,15 @@
 <?php
+
 // See here for a documentation for portable contacts:
 // https://web.archive.org/web/20160405005550/http://portablecontacts.net/draft-spec.html
 
 use Friendica\App;
+use Friendica\Core\Config;
 
 function poco_init(App $a) {
-	require_once("include/bbcode.php");
-
 	$system_mode = false;
 
-	if (intval(get_config('system','block_public')) || (get_config('system','block_local_dir'))) {
+	if (intval(Config::get('system', 'block_public')) || (Config::get('system', 'block_local_dir'))) {
 		http_status_exit(401);
 	}
 
@@ -30,6 +30,7 @@ function poco_init(App $a) {
 	$global = false;
 
 	if ($a->argc > 1 && $a->argv[1] === '@server') {
+		require_once 'include/socgraph.php';
 		// List of all servers that this server knows
 		$ret = poco_serverlist();
 		header('Content-type: application/json');
@@ -54,16 +55,16 @@ function poco_init(App $a) {
 		$cid = intval($a->argv[4]);
 	}
 
-	if (!$system_mode AND !$global) {
-		$r = q("SELECT `user`.*,`profile`.`hide-friends` from user left join profile on `user`.`uid` = `profile`.`uid`
+	if (! $system_mode AND ! $global) {
+		$users = q("SELECT `user`.*,`profile`.`hide-friends` from user left join profile on `user`.`uid` = `profile`.`uid`
 			where `user`.`nickname` = '%s' and `profile`.`is-default` = 1 limit 1",
 			dbesc($user)
 		);
-		if (! dbm::is_result($r) || $r[0]['hidewall'] || $r[0]['hide-friends']) {
+		if (! dbm::is_result($users) || $users[0]['hidewall'] || $users[0]['hide-friends']) {
 			http_status_exit(404);
 		}
 
-		$user = $r[0];
+		$user = $users[0];
 	}
 
 	if ($justme) {
@@ -73,23 +74,23 @@ function poco_init(App $a) {
 //		$sql_extra = " AND `contact`.`self` = 0 ";
 
 	if ($cid) {
-		$sql_extra = sprintf(" AND `contact`.`id` = %d ",intval($cid));
+		$sql_extra = sprintf(" AND `contact`.`id` = %d ", intval($cid));
 	}
-	if (x($_GET,'updatedSince')) {
-		$update_limit =  date("Y-m-d H:i:s",strtotime($_GET['updatedSince']));
+	if (x($_GET, 'updatedSince')) {
+		$update_limit = date("Y-m-d H:i:s", strtotime($_GET['updatedSince']));
 	}
 	if ($global) {
-		$r = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND `updated` >= `last_failure` AND NOT `hide` AND `network` IN ('%s', '%s', '%s')",
+		$contacts = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND `updated` >= `last_failure` AND NOT `hide` AND `network` IN ('%s', '%s', '%s')",
 			dbesc($update_limit),
 			dbesc(NETWORK_DFRN),
 			dbesc(NETWORK_DIASPORA),
 			dbesc(NETWORK_OSTATUS)
 		);
 	} elseif ($system_mode) {
-		$r = q("SELECT count(*) AS `total` FROM `contact` WHERE `self` = 1
+		$contacts = q("SELECT count(*) AS `total` FROM `contact` WHERE `self` = 1
 			AND `uid` IN (SELECT `uid` FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1) ");
 	} else {
-		$r = q("SELECT count(*) AS `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
+		$contacts = q("SELECT count(*) AS `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
 			AND (`success_update` >= `failure_update` OR `last-item` >= `failure_update`)
 			AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra",
 			intval($user['uid']),
@@ -99,8 +100,8 @@ function poco_init(App $a) {
 			dbesc(NETWORK_STATUSNET)
 		);
 	}
-	if (dbm::is_result($r)) {
-		$totalResults = intval($r[0]['total']);
+	if (dbm::is_result($contacts)) {
+		$totalResults = intval($contacts[0]['total']);
 	} else {
 		$totalResults = 0;
 	}
@@ -108,11 +109,11 @@ function poco_init(App $a) {
 	if (! $startIndex) {
 		$startIndex = 0;
 	}
-	$itemsPerPage = ((x($_GET,'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults);
+	$itemsPerPage = ((x($_GET, 'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults);
 
 	if ($global) {
 		logger("Start global query", LOGGER_DEBUG);
-		$r = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND NOT `hide` AND `network` IN ('%s', '%s', '%s') AND `updated` > `last_failure`
+		$contacts = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND NOT `hide` AND `network` IN ('%s', '%s', '%s') AND `updated` > `last_failure`
 			ORDER BY `updated` DESC LIMIT %d, %d",
 			dbesc($update_limit),
 			dbesc(NETWORK_DFRN),
@@ -123,7 +124,7 @@ function poco_init(App $a) {
 		);
 	} elseif ($system_mode) {
 		logger("Start system mode query", LOGGER_DEBUG);
-		$r = q("SELECT `contact`.*, `profile`.`about` AS `pabout`, `profile`.`locality` AS `plocation`, `profile`.`pub_keywords`,
+		$contacts = q("SELECT `contact`.*, `profile`.`about` AS `pabout`, `profile`.`locality` AS `plocation`, `profile`.`pub_keywords`,
 				`profile`.`gender` AS `pgender`, `profile`.`address` AS `paddress`, `profile`.`region` AS `pregion`,
 				`profile`.`postal-code` AS `ppostalcode`, `profile`.`country-name` AS `pcountry`, `user`.`account-type`
 			FROM `contact` INNER JOIN `profile` ON `profile`.`uid` = `contact`.`uid`
@@ -134,8 +135,8 @@ function poco_init(App $a) {
 			intval($itemsPerPage)
 		);
 	} else {
-		logger("Start query for user ".$user['nickname'], LOGGER_DEBUG);
-		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
+		logger("Start query for user " . $user['nickname'], LOGGER_DEBUG);
+		$contacts = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
 			AND (`success_update` >= `failure_update` OR `last-item` >= `failure_update`)
 			AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra LIMIT %d, %d",
 			intval($user['uid']),
@@ -150,13 +151,13 @@ function poco_init(App $a) {
 	logger("Query done", LOGGER_DEBUG);
 
 	$ret = array();
-	if (x($_GET,'sorted')) {
+	if (x($_GET, 'sorted')) {
 		$ret['sorted'] = false;
 	}
-	if (x($_GET,'filtered')) {
+	if (x($_GET, 'filtered')) {
 		$ret['filtered'] = false;
 	}
-	if (x($_GET,'updatedSince') AND !$global) {
+	if (x($_GET, 'updatedSince') AND ! $global) {
 		$ret['updatedSince'] = false;
 	}
 	$ret['startIndex']   = (int) $startIndex;
@@ -182,134 +183,135 @@ function poco_init(App $a) {
 		'generation' => false
 	);
 
-	if ((! x($_GET,'fields')) || ($_GET['fields'] === '@all')) {
+	if ((! x($_GET, 'fields')) || ($_GET['fields'] === '@all')) {
 		foreach ($fields_ret as $k => $v) {
 			$fields_ret[$k] = true;
 		}
 	} else {
-		$fields_req = explode(',',$_GET['fields']);
+		$fields_req = explode(',', $_GET['fields']);
 		foreach ($fields_req as $f) {
 			$fields_ret[trim($f)] = true;
 		}
 	}
 
-	if (is_array($r)) {
-		if (dbm::is_result($r)) {
-			foreach ($r as $rr) {
-				if (!isset($rr['generation'])) {
+	if (is_array($contacts)) {
+		if (dbm::is_result($contacts)) {
+			foreach ($contacts as $contact) {
+				if (! isset($contact['generation'])) {
 					if ($global) {
-						$rr['generation'] = 3;
+						$contact['generation'] = 3;
 					} elseif ($system_mode) {
-						$rr['generation'] = 1;
+						$contact['generation'] = 1;
 					} else {
-						$rr['generation'] = 2;
+						$contact['generation'] = 2;
 					}
 				}
 
-				if (($rr['about'] == "") AND isset($rr['pabout'])) {
-					$rr['about'] = $rr['pabout'];
+				if (($contact['about'] == "") AND isset($contact['pabout'])) {
+					$contact['about'] = $contact['pabout'];
 				}
-				if ($rr['location'] == "") {
-					if (isset($rr['plocation'])) {
-						$rr['location'] = $rr['plocation'];
+				if ($contact['location'] == "") {
+					if (isset($contact['plocation'])) {
+						$contact['location'] = $contact['plocation'];
 					}
-					if (isset($rr['pregion']) AND ($rr['pregion'] != "")) {
-						if ($rr['location'] != "") {
-							$rr['location'] .= ", ";
+					if (isset($contact['pregion']) AND ( $contact['pregion'] != "")) {
+						if ($contact['location'] != "") {
+							$contact['location'] .= ", ";
 						}
-						$rr['location'] .= $rr['pregion'];
+						$contact['location'] .= $contact['pregion'];
 					}
 
-					if (isset($rr['pcountry']) AND ($rr['pcountry'] != "")) {
-						if ($rr['location'] != "") {
-							$rr['location'] .= ", ";
+					if (isset($contact['pcountry']) AND ( $contact['pcountry'] != "")) {
+						if ($contact['location'] != "") {
+							$contact['location'] .= ", ";
 						}
-						$rr['location'] .= $rr['pcountry'];
+						$contact['location'] .= $contact['pcountry'];
 					}
 				}
 
-				if (($rr['gender'] == "") AND isset($rr['pgender'])) {
-					$rr['gender'] = $rr['pgender'];
+				if (($contact['gender'] == "") AND isset($contact['pgender'])) {
+					$contact['gender'] = $contact['pgender'];
 				}
-				if (($rr['keywords'] == "") AND isset($rr['pub_keywords'])) {
-					$rr['keywords'] = $rr['pub_keywords'];
+				if (($contact['keywords'] == "") AND isset($contact['pub_keywords'])) {
+					$contact['keywords'] = $contact['pub_keywords'];
 				}
-				if (isset($rr['account-type'])) {
-					$rr['contact-type'] = $rr['account-type'];
+				if (isset($contact['account-type'])) {
+					$contact['contact-type'] = $contact['account-type'];
 				}
-				$about = Cache::get("about:".$rr['updated'].":".$rr['nurl']);
+				$about = Cache::get("about:" . $contact['updated'] . ":" . $contact['nurl']);
 				if (is_null($about)) {
-					$about = bbcode($rr['about'], false, false);
-					Cache::set("about:".$rr['updated'].":".$rr['nurl'],$about);
+					require_once 'include/bbcode.php';
+					$about = bbcode($contact['about'], false, false);
+					Cache::set("about:" . $contact['updated'] . ":" . $contact['nurl'], $about);
 				}
 
 				// Non connected persons can only see the keywords of a Diaspora account
-				if ($rr['network'] == NETWORK_DIASPORA) {
-					$rr['location'] = "";
+				if ($contact['network'] == NETWORK_DIASPORA) {
+					$contact['location'] = "";
 					$about = "";
-					$rr['gender'] = "";
+					$contact['gender'] = "";
 				}
 
 				$entry = array();
 				if ($fields_ret['id']) {
-					$entry['id'] = (int)$rr['id'];
+					$entry['id'] = (int)$contact['id'];
 				}
 				if ($fields_ret['displayName']) {
-					$entry['displayName'] = $rr['name'];
+					$entry['displayName'] = $contact['name'];
 				}
 				if ($fields_ret['aboutMe']) {
 					$entry['aboutMe'] = $about;
 				}
 				if ($fields_ret['currentLocation']) {
-					$entry['currentLocation'] = $rr['location'];
+					$entry['currentLocation'] = $contact['location'];
 				}
 				if ($fields_ret['gender']) {
-					$entry['gender'] = $rr['gender'];
+					$entry['gender'] = $contact['gender'];
 				}
 				if ($fields_ret['generation']) {
-					$entry['generation'] = (int)$rr['generation'];
+					$entry['generation'] = (int)$contact['generation'];
 				}
 				if ($fields_ret['urls']) {
-					$entry['urls'] = array(array('value' => $rr['url'], 'type' => 'profile'));
-					if ($rr['addr'] && ($rr['network'] !== NETWORK_MAIL)) {
-						$entry['urls'][] = array('value' => 'acct:' . $rr['addr'], 'type' => 'webfinger');
+					$entry['urls'] = array(array('value' => $contact['url'], 'type' => 'profile'));
+					if ($contact['addr'] && ($contact['network'] !== NETWORK_MAIL)) {
+						$entry['urls'][] = array('value' => 'acct:' . $contact['addr'], 'type' => 'webfinger');
 					}
 				}
 				if ($fields_ret['preferredUsername']) {
-					$entry['preferredUsername'] = $rr['nick'];
+					$entry['preferredUsername'] = $contact['nick'];
 				}
 				if ($fields_ret['updated']) {
-					if (!$global) {
-						$entry['updated'] = $rr['success_update'];
+					if (! $global) {
+						$entry['updated'] = $contact['success_update'];
 
-						if ($rr['name-date'] > $entry['updated']) {
-							$entry['updated'] = $rr['name-date'];
+						if ($contact['name-date'] > $entry['updated']) {
+							$entry['updated'] = $contact['name-date'];
 						}
-						if ($rr['uri-date'] > $entry['updated']) {
-							$entry['updated'] = $rr['uri-date'];
+						if ($contact['uri-date'] > $entry['updated']) {
+							$entry['updated'] = $contact['uri-date'];
 						}
-						if ($rr['avatar-date'] > $entry['updated']) {
-							$entry['updated'] = $rr['avatar-date'];
+						if ($contact['avatar-date'] > $entry['updated']) {
+							$entry['updated'] = $contact['avatar-date'];
 						}
 					} else {
-						$entry['updated'] = $rr['updated'];
+						$entry['updated'] = $contact['updated'];
 					}
 					$entry['updated'] = date("c", strtotime($entry['updated']));
 				}
 				if ($fields_ret['photos']) {
-					$entry['photos'] = array(array('value' => $rr['photo'], 'type' => 'profile'));
+					$entry['photos'] = array(array('value' => $contact['photo'], 'type' => 'profile'));
 				}
 				if ($fields_ret['network']) {
-					$entry['network'] = $rr['network'];
+					$entry['network'] = $contact['network'];
 					if ($entry['network'] == NETWORK_STATUSNET) {
 						$entry['network'] = NETWORK_OSTATUS;
 					}
-					if (($entry['network'] == "") AND ($rr['self'])) {
+					if (($entry['network'] == "") AND ($contact['self'])) {
 						$entry['network'] = NETWORK_DFRN;
 					}
 				}
 				if ($fields_ret['tags']) {
-					$tags = str_replace(","," ",$rr['keywords']);
+					$tags = str_replace(",", " ", $contact['keywords']);
 					$tags = explode(" ", $tags);
 
 					$cleaned = array();
@@ -329,23 +331,23 @@ function poco_init(App $a) {
 					//if (isset($rr['paddress']))
 					//	 $entry['address']['streetAddress'] = $rr['paddress'];
 
-					if (isset($rr['plocation'])) {
-						 $entry['address']['locality'] = $rr['plocation'];
+					if (isset($contact['plocation'])) {
+						$entry['address']['locality'] = $contact['plocation'];
 					}
-					if (isset($rr['pregion'])) {
-						 $entry['address']['region'] = $rr['pregion'];
+					if (isset($contact['pregion'])) {
+						$entry['address']['region'] = $contact['pregion'];
 					}
 					// See above
 					//if (isset($rr['ppostalcode']))
 					//	 $entry['address']['postalCode'] = $rr['ppostalcode'];
 
-					if (isset($rr['pcountry'])) {
-						 $entry['address']['country'] = $rr['pcountry'];
+					if (isset($contact['pcountry'])) {
+						$entry['address']['country'] = $contact['pcountry'];
 					}
 				}
 
 				if ($fields_ret['contactType']) {
-					$entry['contactType'] = intval($rr['contact-type']);
+					$entry['contactType'] = intval($contact['contact-type']);
 				}
 				$ret['entry'][] = $entry;
 			}
@@ -359,7 +361,7 @@ function poco_init(App $a) {
 
 	if ($format === 'xml') {
 		header('Content-type: text/xml');
-		echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify(array('$response' => $ret)));
+		echo replace_macros(get_markup_template('poco_xml.tpl'), array_xmlify(array('$response' => $ret)));
 		killme();
 	}
 	if ($format === 'json') {