diff --git a/membersince/membersince.php b/membersince/membersince.php
index 18754958..543bb231 100644
--- a/membersince/membersince.php
+++ b/membersince/membersince.php
@@ -17,11 +17,13 @@ function membersince_install()
 	Addon::registerHook('profile_advanced', 'addon/membersince/membersince.php', 'membersince_display');
 }
 
-function membersince_uninstall() {
+function membersince_uninstall()
+{
 	Addon::unregisterHook('profile_advanced', 'addon/membersince/membersince.php', 'membersince_display');
 }
 
-function membersince_display(App $a, array &$b) {
+function membersince_display(App $a, array &$b)
+{
 	if ($a->getCurrentTheme() == 'frio') {
 		// Works in Frio.
 		$doc = new DOMDocument();
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 4861c789..b97543f5 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -90,15 +90,18 @@ function openstreetmap_location($a, &$item)
 		$nomserver = OSM_NOM;
 	}
 
-	if (isset($item['coord'])) {
+	if (!empty($item['coord'])) {
 		$coords = explode(' ', $item['coord']);
+
 		if (count($coords) > 1) {
 			$lat = urlencode(round($coords[0], 5));
 			$lon = urlencode(round($coords[1], 5));
 			$target = $tmsserver;
+
 			if ($marker > 0) {
 				$target .= '?mlat=' . $lat . '&mlon=' . $lon;
 			}
+
 			$target .= '#map='.intval($zoom).'/'.$lat.'/'.$lon;
 		}
 	}
@@ -107,7 +110,7 @@ function openstreetmap_location($a, &$item)
 		$target = $nomserver.'?q='.urlencode($item['location']);
 	}
 
-	if (isset($item['location'])) {
+	if (!empty($item['location'])) {
 		$title = $item['location'];
 	} else {
 		$title = $item['coord'];
diff --git a/pledgie/pledgie.php b/pledgie/pledgie.php
index c549872b..81c86c2d 100644
--- a/pledgie/pledgie.php
+++ b/pledgie/pledgie.php
@@ -12,19 +12,22 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 
-function pledgie_install() { 
+function pledgie_install()
+{ 
 	Addon::registerHook('page_end', 'addon/pledgie/pledgie.php', 'pledgie_active'); 
 	Addon::registerHook('addon_settings', 'addon/pledgie/pledgie.php', 'pledgie_addon_settings');
 	Addon::registerHook('addon_settings_post', 'addon/pledgie/pledgie.php', 'pledgie_addon_settings_post');
 }
 
-function pledgie_uninstall() { 
+function pledgie_uninstall()
+{ 
 	Addon::unregisterHook('page_end', 'addon/pledgie/pledgie.php', 'pledgie_active');
 	Addon::unregisterHook('addon_settings', 'addon/pledgie/pledgie.php', 'pledgie_addon_settings');
 	Addon::unregisterHook('addon_settings_post', 'addon/pledgie/pledgie.php', 'pledgie_addon_settings_post');
 }
 
-function pledgie_addon_settings(App $a,&$s) {
+function pledgie_addon_settings(App $a, &$s)
+{
 
 	if(! is_site_admin())
 		return;
@@ -59,8 +62,8 @@ function pledgie_addon_settings(App $a,&$s) {
 	return;
 }
 
-function pledgie_addon_settings_post(App $a, array &$b) {
-
+function pledgie_addon_settings_post(App $a, array &$b)
+{
 	if(! is_site_admin())
 		return;
 
@@ -71,9 +74,11 @@ function pledgie_addon_settings_post(App $a, array &$b) {
 	}
 }
 
-function pledgie_active(App $a, &$b) {
+function pledgie_active(App $a, &$b)
+{
 	$campaign = Config::get('pledgie-campaign','text');
 	$describe = Config::get('pledgie-describe','text');
+
 	$b .= '<div style="position: fixed; padding:5px; border-style:dotted; border-width:1px; background-color: white; line-height: 1; bottom: 5px; left: 20px; z-index: 1000; width: 150px; font-size: 12px;">';
 	$b .= $describe . '<br/><a href="https://pledgie.com/campaigns/';
 	$b .= $campaign;
diff --git a/securemail/securemail.php b/securemail/securemail.php
index 649aca9d..d8f4a9a9 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -25,7 +25,8 @@ require_once 'openpgp.php';
 require_once 'openpgp_crypt_symmetric.php';
 
 
-function securemail_install() {
+function securemail_install()
+{
     Addon::registerHook('addon_settings', 'addon/securemail/securemail.php', 'securemail_settings');
     Addon::registerHook('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post');
 
@@ -53,7 +54,8 @@ function securemail_uninstall() {
  *
  * @see App
  */
-function securemail_settings(App $a, &$s){
+function securemail_settings(App $a, &$s)
+{
     if (!local_user()) {
         return;
     }
@@ -82,8 +84,8 @@ function securemail_settings(App $a, &$s){
  *
  * @see App
  */
-function securemail_settings_post(App $a, array &$b){
-
+function securemail_settings_post(App $a, array &$b)
+{
     if (!local_user()) {
         return;
     }
@@ -146,8 +148,10 @@ function securemail_settings_post(App $a, array &$b){
  * @param array $b hook data
  *
  * @see App
+ * @todo x() is deprecated, next PR
  */
-function securemail_emailer_send_prepare(App $a, array &$b) {
+function securemail_emailer_send_prepare(App $a, array &$b)
+{
     if (!x($b, 'uid')) {
         return;
     }
@@ -183,7 +187,7 @@ function securemail_emailer_send_prepare(App $a, array &$b) {
     $b['htmlVersion'] = null;
 }
 
-
+/// @TODO Old lost code? Next PR!
 /**
  * add addon composer autoloader maps to system autoloader