diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 7a5fd6f5f..3e9854b9f 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -13,15 +13,14 @@ function follow_widget($value = "") {
 }
 
 function findpeople_widget() {
-	require_once('include/Contact.php');
+	require_once 'include/Contact.php';
 
 	$a = get_app();
 
-	if (get_config('system','invitation_only')) {
-		$x = get_pconfig(local_user(),'system','invites_remaining');
+		$x = get_pconfig(local_user(), 'system', 'invites_remaining');
 		if ($x || is_site_admin()) {
 			$a->page['aside'] .= '<div class="side-link" id="side-invite-remain">'
-			. sprintf( tt('%d invitation available','%d invitations available',$x), $x)
+			. sprintf( tt('%d invitation available','%d invitations available', $x), $x)
 			. '</div>' . $inv;
 		}
 	}
@@ -45,32 +44,41 @@ function unavailable_networks() {
 
 	$networks = array();
 
-	if (!plugin_enabled("appnet"))
+	if (!plugin_enabled("appnet")) {
 		$networks[] = NETWORK_APPNET;
+	}
 
-	if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook"))
+	if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook")) {
 		$networks[] = NETWORK_FACEBOOK;
+	}
 
-	if (!plugin_enabled("statusnet"))
+	if (!plugin_enabled("statusnet")) {
 		$networks[] = NETWORK_STATUSNET;
+	}
 
-	if (!plugin_enabled("pumpio"))
+	if (!plugin_enabled("pumpio")) {
 		$networks[] = NETWORK_PUMPIO;
+	}
 
-	if (!plugin_enabled("twitter"))
+	if (!plugin_enabled("twitter")) {
 		$networks[] = NETWORK_TWITTER;
+	}
 
-	if (get_config("system","ostatus_disabled"))
+	if (get_config("system", "ostatus_disabled")) {
 		$networks[] = NETWORK_OSTATUS;
+	}
 
-	if (!get_config("system","diaspora_enabled"))
+	if (!get_config("system", "diaspora_enabled")) {
 		$networks[] = NETWORK_DIASPORA;
+	}
 
-	if (!plugin_enabled("pnut"))
+	if (!plugin_enabled("pnut")) {
 		$networks[] = NETWORK_PNUT;
+	}
 
-	if (!sizeof($networks))
+	if (!sizeof($networks)) {
 		return "";
+	}
 
 	$network_filter = implode("','", $networks);
 
@@ -79,7 +87,7 @@ function unavailable_networks() {
 	return $network_filter;
 }
 
-function networks_widget($baseurl,$selected = '') {
+function networks_widget($baseurl, $selected = '') {
 
 	$a = get_app();
 
@@ -99,7 +107,7 @@ function networks_widget($baseurl,$selected = '') {
 
 	$nets = array();
 	if (dbm::is_result($r)) {
-		require_once('include/contact_selectors.php');
+		require_once 'include/contact_selectors.php';
 		foreach ($r as $rr) {
 			/// @TODO If 'network' is not there, this triggers an E_NOTICE
 			if ($rr['network']) {
@@ -108,8 +116,9 @@ function networks_widget($baseurl,$selected = '') {
 		}
 	}
 
-	if (count($nets) < 2)
+	if (count($nets) < 2) {
 		return '';
+	}
 
 	return replace_macros(get_markup_template('nets.tpl'),array(
 		'$title' => t('Networks'),
@@ -122,7 +131,7 @@ function networks_widget($baseurl,$selected = '') {
 	));
 }
 
-function fileas_widget($baseurl,$selected = '') {
+function fileas_widget($baseurl, $selected = '') {
 	if (! local_user()) {
 		return '';
 	}
@@ -131,14 +140,14 @@ function fileas_widget($baseurl,$selected = '') {
 		return '';
 	}
 
-	$saved = get_pconfig(local_user(),'system','filetags');
+	$saved = get_pconfig(local_user(),'system', 'filetags');
 	if (! strlen($saved)) {
 		return;
 	}
 
 	$matches = false;
 	$terms = array();
-	$cnt = preg_match_all('/\[(.*?)\]/',$saved,$matches,PREG_SET_ORDER);
+	$cnt = preg_match_all('/\[(.*?)\]/', $saved, $matches,PREG_SET_ORDER);
 	if ($cnt) {
 		foreach ($matches as $mtch) {
 			$unescaped = xmlify(file_tag_decode($mtch[1]));
@@ -157,7 +166,7 @@ function fileas_widget($baseurl,$selected = '') {
 	));
 }
 
-function categories_widget($baseurl,$selected = '') {
+function categories_widget($baseurl, $selected = '') {
 
 	$a = get_app();
 
@@ -165,7 +174,7 @@ function categories_widget($baseurl,$selected = '') {
 		return '';
 	}
 
-	$saved = get_pconfig($a->profile['profile_uid'],'system','filetags');
+	$saved = get_pconfig($a->profile['profile_uid'],'system', 'filetags');
 	if (! strlen($saved)) {
 		return;
 	}
@@ -231,21 +240,21 @@ function common_friends_visitor_widget($profile_uid) {
 		return;
 	}
 
-	require_once('include/socgraph.php');
+	require_once 'include/socgraph.php';
 
 	if ($cid) {
-		$t = count_common_friends($profile_uid,$cid);
+		$t = count_common_friends($profile_uid, $cid);
 	} else {
-		$t = count_common_friends_zcid($profile_uid,$zcid);
+		$t = count_common_friends_zcid($profile_uid, $zcid);
 	}
 	if (! $t) {
 		return;
 	}
 
 	if ($cid) {
-		$r = common_friends($profile_uid,$cid,0,5,true);
+		$r = common_friends($profile_uid, $cid, 0, 5, true);
 	} else {
-		$r = common_friends_zcid($profile_uid,$zcid,0,5,true);
+		$r = common_friends_zcid($profile_uid, $zcid, 0, 5, true);
 	}
 
 	return replace_macros(get_markup_template('remote_friends_common.tpl'), array(