diff --git a/include/Contact.php b/include/Contact.php
index 5cf40a9f0..b1f63cbdf 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -85,11 +85,12 @@ function contact_remove($id) {
 
 function terminate_friendship($user,$self,$contact) {
 
+	/// @TODO Get rid of this, include/datetime.php should care about by itself
 	$a = get_app();
 
 	require_once('include/datetime.php');
 
-	if($contact['network'] === NETWORK_OSTATUS) {
+	if ($contact['network'] === NETWORK_OSTATUS) {
 
 		require_once('include/ostatus.php');
 
@@ -99,16 +100,14 @@ function terminate_friendship($user,$self,$contact) {
 		$item['follow'] = $contact["url"];
 		$slap = ostatus::salmon($item, $user);
 
-		if((x($contact,'notify')) && (strlen($contact['notify']))) {
+		if ((x($contact,'notify')) && (strlen($contact['notify']))) {
 			require_once('include/salmon.php');
 			slapper($user,$contact['notify'],$slap);
 		}
-	}
-	elseif($contact['network'] === NETWORK_DIASPORA) {
+	} elseif ($contact['network'] === NETWORK_DIASPORA) {
 		require_once('include/diaspora.php');
 		Diaspora::send_unshare($user,$contact);
-	}
-	elseif($contact['network'] === NETWORK_DFRN) {
+	} elseif ($contact['network'] === NETWORK_DFRN) {
 		require_once('include/dfrn.php');
 		dfrn::deliver($user,$contact,'placeholder', 1);
 	}
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index dc86ba034..a20775379 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -65,20 +65,24 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
 	$exclude = false;
 	$size = 4;
 
-	if(is_array($options)) {
-		if(x($options,'size'))
+	if (is_array($options)) {
+		if (x($options,'size'))
 			$size = $options['size'];
 
-		if(x($options,'mutual_friends'))
+		if (x($options,'mutual_friends')) {
 			$mutual = true;
-		if(x($options,'single'))
+		}
+		if (x($options,'single')) {
 			$single = true;
-		if(x($options,'multiple'))
+		}
+		if (x($options,'multiple')) {
 			$single = false;
-		if(x($options,'exclude'))
+		}
+		if (x($options,'exclude')) {
 			$exclude = $options['exclude'];
+		}
 
-		if(x($options,'networks')) {
+		if (x($options,'networks')) {
 			switch($options['networks']) {
 				case 'DFRN_ONLY':
 					$networks = array(NETWORK_DFRN);
@@ -146,10 +150,11 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
 
 	if (dbm::is_result($r)) {
 		foreach ($r as $rr) {
-			if((is_array($preselected)) && in_array($rr['id'], $preselected))
+			if ((is_array($preselected)) && in_array($rr['id'], $preselected)) {
 				$selected = " selected=\"selected\" ";
-			else
+			} else {
 				$selected = '';
+			}
 
 			$trimmed = mb_substr($rr['name'],0,20);
 
@@ -231,8 +236,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
 			if ($privmail) {
 				$trimmed = GetProfileUsername($rr['url'], $rr['name'], false);
-			}
-			else {
+			} else {
 				$trimmed = mb_substr($rr['name'],0,20);
 			}
 
@@ -260,16 +264,22 @@ function fixacl(&$item) {
 
 function prune_deadguys($arr) {
 
-	if(! $arr)
+	if (! $arr) {
 		return $arr;
+	}
+
 	$str = dbesc(implode(',',$arr));
+
 	$r = q("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 ");
+
 	if ($r) {
 		$ret = array();
-		foreach($r as $rr)
+		foreach ($r as $rr) {
 			$ret[] = intval($rr['id']);
+		}
 		return $ret;
 	}
+
 	return array();
 }
 
@@ -545,35 +555,33 @@ function acl_lookup(&$a, $out_type = 'json') {
 			dbesc(NETWORK_ZOT),
 			dbesc(NETWORK_DIASPORA)
 		);
-	}
-	elseif($type == 'a') {
+	} elseif ($type == 'a') {
 		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `forum`, `prv` FROM `contact`
 			WHERE `uid` = %d AND `pending` = 0
 			$sql_extra2
 			ORDER BY `name` ASC ",
 			intval(local_user())
 		);
-	}
-	elseif($type == 'x') {
+	} elseif ($type == 'x') {
 		// autocomplete for global contact search (e.g. navbar search)
 		$r = navbar_complete($a);
 		$contacts = array();
 		if ($r) {
-			foreach($r as $g) {
+			foreach ($r as $g) {
 				$contacts[] = array(
-					"photo"    => proxy_url($g['photo'], false, PROXY_SIZE_MICRO),
-					"name"     => $g['name'],
-					"nick"     => (x($g['addr']) ? $g['addr'] : $g['url']),
-					"network" => $g['network'],
-					"link" => $g['url'],
-					"forum"	   => (x($g['community']) ? 1 : 0),
+					'photo'   => proxy_url($g['photo'], false, PROXY_SIZE_MICRO),
+					'name'    => $g['name'],
+					'nick'    => (x($g['addr']) ? $g['addr'] : $g['url']),
+					'network' => $g['network'],
+					'link'    => $g['url'],
+					'forum'   => (x($g['community']) ? 1 : 0),
 				);
 			}
 		}
 		$o = array(
 			'start' => $start,
-			'count'	=> $count,
-			'items'	=> $contacts,
+			'count' => $count,
+			'items' => $contacts,
 		);
 		echo json_encode($o);
 		killme();
@@ -583,16 +591,16 @@ function acl_lookup(&$a, $out_type = 'json') {
 
 
 	if (dbm::is_result($r)) {
-		foreach($r as $g){
+		foreach ($r as $g){
 			$contacts[] = array(
-				"type"  => "c",
-				"photo" => proxy_url($g['micro'], false, PROXY_SIZE_MICRO),
-				"name"  => htmlentities($g['name']),
-				"id"	=> intval($g['id']),
-				"network" => $g['network'],
-				"link" => $g['url'],
-				"nick" => htmlentities(($g['attag']) ? $g['attag'] : $g['nick']),
-				"forum" => ((x($g['forum']) || x($g['prv'])) ? 1 : 0),
+				'type'    => 'c',
+				'photo'   => proxy_url($g['micro'], false, PROXY_SIZE_MICRO),
+				'name'    => htmlentities($g['name']),
+				'id'      => intval($g['id']),
+				'network' => $g['network'],
+				'link'    => $g['url'],
+				'nick'    => htmlentities(($g['attag']) ? $g['attag'] : $g['nick']),
+				'forum'   => ((x($g['forum']) || x($g['prv'])) ? 1 : 0),
 			);
 		}
 	}
@@ -618,7 +626,7 @@ function acl_lookup(&$a, $out_type = 'json') {
 				implode("','", $known_contacts)
 		);
 		if (dbm::is_result($r)){
-			foreach($r as $row) {
+			foreach ($r as $row) {
 				// nickname..
 				$up = parse_url($row['author-link']);
 				$nick = explode("/",$up['path']);
@@ -626,14 +634,14 @@ function acl_lookup(&$a, $out_type = 'json') {
 				$nick .= "@".$up['host'];
 				// /nickname
 				$unknow_contacts[] = array(
-					"type"  => "c",
-					"photo" => proxy_url($row['author-avatar'], false, PROXY_SIZE_MICRO),
-					"name"  => htmlentities($row['author-name']),
-					"id"	=> '',
-					"network" => "unknown",
-					"link" => $row['author-link'],
-					"nick" => htmlentities($nick),
-					"forum" => false
+					'type'    => 'c',
+					'photo'   => proxy_url($row['author-avatar'], false, PROXY_SIZE_MICRO),
+					'name'    => htmlentities($row['author-name']),
+					'id'      => '',
+					'network' => 'unknown',
+					'link'    => $row['author-link'],
+					'nick'    => htmlentities($nick),
+					'forum'   => false
 				);
 			}
 		}
@@ -643,34 +651,34 @@ function acl_lookup(&$a, $out_type = 'json') {
 	}
 
 	$results = array(
-		"tot"	=> $tot,
-		"start" => $start,
-		"count" => $count,
-		"groups" => $groups,
-		"contacts" => $contacts,
-		"items"	=> $items,
-		"type"	=> $type,
-		"search" => $search,
+		'tot'      => $tot,
+		'start'    => $start,
+		'count'    => $count,
+		'groups'   => $groups,
+		'contacts' => $contacts,
+		'items'    => $items,
+		'type'     => $type,
+		'search'   => $search,
 	);
 
 	call_hooks('acl_lookup_end', $results);
 
 	if($out_type === 'html') {
 		$o = array(
-			'tot'		=> $results["tot"],
-			'start'		=> $results["start"],
-			'count'		=> $results["count"],
-			'groups'	=> $results["groups"],
-			'contacts'	=> $results["contacts"],
+			'tot'      => $results['tot'],
+			'start'    => $results['start'],
+			'count'    => $results['count'],
+			'groups'   => $results['groups'],
+			'contacts' => $results['contacts'],
 		);
 		return $o;
 	}
 
 	$o = array(
-		'tot'	=> $results["tot"],
-		'start' => $results["start"],
-		'count'	=> $results["count"],
-		'items'	=> $results["items"],
+		'tot'   => $results['tot'],
+		'start' => $results['start'],
+		'count' => $results['count'],
+		'items' => $results['items'],
 	);
 
 	echo json_encode($o);
@@ -687,7 +695,7 @@ function navbar_complete(&$a) {
 
 //	logger('navbar_complete');
 
-	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+	if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
 		return;
 	}
 
@@ -698,28 +706,32 @@ function navbar_complete(&$a) {
 	$mode = $_REQUEST['smode'];
 
 	// don't search if search term has less than 2 characters
-	if(! $search || mb_strlen($search) < 2)
+	if (! $search || mb_strlen($search) < 2) {
 		return array();
+	}
 
-	if(substr($search,0,1) === '@')
+	if (substr($search,0,1) === '@') {
 		$search = substr($search,1);
+	}
 
-	if($localsearch) {
+	if ($localsearch) {
 		$x = DirSearch::global_search_by_name($search, $mode);
 		return $x;
 	}
 
-	if(! $localsearch) {
+	if (! $localsearch) {
 		$p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
 
 		$x = z_fetch_url(get_server().'/lsearch?f=' . $p .  '&search=' . urlencode($search));
-		if($x['success']) {
+		if ($x['success']) {
 			$t = 0;
 			$j = json_decode($x['body'],true);
-			if($j && $j['results']) {
+			if ($j && $j['results']) {
 				return $j['results'];
 			}
 		}
 	}
+
+	/// @TODO Not needed here?
 	return;
 }
diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 6af97368f..9c1d43cd8 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -94,19 +94,19 @@ function fbrowser_content($a){
 			$tpl = get_markup_template($template_file);
 
 			$o =  replace_macros($tpl, array(
-				'$type' => 'image',
-				'$baseurl' => App::get_baseurl(),
-				'$path' => $path,
-				'$folders' => $albums,
-				'$files' =>$files,
-				'$cancel' => t('Cancel'),
+				'$type'     => 'image',
+				'$baseurl'  => App::get_baseurl(),
+				'$path'     => $path,
+				'$folders'  => $albums,
+				'$files'    => $files,
+				'$cancel'   => t('Cancel'),
 				'$nickname' => $a->user['nickname'],
 			));
 
 
 			break;
 		case "file":
-			if ($a->argc==2){
+			if ($a->argc==2) {
 				$files = q("SELECT `id`, `filename`, `filetype` FROM `attach` WHERE `uid` = %d ",
 					intval(local_user())
 				);
@@ -116,10 +116,9 @@ function fbrowser_content($a){
 					list($m1,$m2) = explode("/",$rr['filetype']);
 					$filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
 
-					if($a->theme['template_engine'] === 'internal') {
+					if ($a->theme['template_engine'] === 'internal') {
 						$filename_e = template_escape($rr['filename']);
-					}
-					else {
+					} else {
 						$filename_e = $rr['filename'];
 					}
 
@@ -130,12 +129,12 @@ function fbrowser_content($a){
 
 				$tpl = get_markup_template($template_file);
 				$o = replace_macros($tpl, array(
-					'$type' => 'file',
-					'$baseurl' => App::get_baseurl(),
-					'$path' => array( array( "", t("Files")) ),
-					'$folders' => false,
-					'$files' =>$files,
-					'$cancel' => t('Cancel'),
+					'$type'     => 'file',
+					'$baseurl'  => App::get_baseurl(),
+					'$path'     => array( array( "", t("Files")) ),
+					'$folders'  => false,
+					'$files'    =>$files,
+					'$cancel'   => t('Cancel'),
 					'$nickname' => $a->user['nickname'],
 				));
 
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 963f43693..04c8d7bde 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -21,21 +21,24 @@ function ostatus_subscribe_content(&$a) {
 
 	if (get_pconfig($uid, "ostatus", "legacy_friends") == "") {
 
-		if ($_REQUEST["url"] == "")
+		if ($_REQUEST["url"] == "") {
 			return $o.t("No contact provided.");
+		}
 
 		$contact = probe_url($_REQUEST["url"]);
 
-		if (!$contact)
+		if (!$contact) {
 			return $o.t("Couldn't fetch information for contact.");
+		}
 
 		$api = $contact["baseurl"]."/api/";
 
 		// Fetching friends
 		$data = z_fetch_url($api."statuses/friends.json?screen_name=".$contact["nick"]);
 
-		if (!$data["success"])
+		if (!$data["success"]) {
 			return $o.t("Couldn't fetch friends for contact.");
+		}
 
 		set_pconfig($uid, "ostatus", "legacy_friends", $data["body"]);
 	}
@@ -61,12 +64,14 @@ function ostatus_subscribe_content(&$a) {
 	$data = probe_url($url);
 	if ($data["network"] == NETWORK_OSTATUS) {
 		$result = new_contact($uid,$url,true);
-		if ($result["success"])
+		if ($result["success"]) {
 			$o .= " - ".t("success");
-		else
+		} else {
 			$o .= " - ".t("failed");
-	} else
+		}
+	} else {
 		$o .= " - ".t("ignored");
+	}
 
 	$o .= "</p>";