diff --git a/blogger/blogger.php b/blogger/blogger.php
index 066de29e..563d0ce4 100644
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -3,7 +3,7 @@
  * Name: Blogger Post Connector
  * Description: Post to Blogger (or anything else which uses blogger XMLRPC API)
  * Version: 1.0
- *
+ * Status: Unsupported
  */
 
 use Friendica\App;
diff --git a/diaspora/Diaspora_Connection.php b/diaspora/Diaspora_Connection.php
index a33bf608..67bc63df 100644
--- a/diaspora/Diaspora_Connection.php
+++ b/diaspora/Diaspora_Connection.php
@@ -46,11 +46,7 @@ class Diaspora_Connection {
 	public function setDiasporaID($id) {
 		$parts = explode('@', $id);
 		$this->user = $parts[0];
-		if (count($parts) > 1) {
-			$this->host = $parts[1];
-		} else {
-			$this->host = '';
-		}
+		$this->host = $parts[1];
 	}
 
 	public function getDiasporaID() {
diff --git a/irc/irc.php b/irc/irc.php
index aa727e2e..eab755c8 100644
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -6,7 +6,6 @@
 * Author: tony baldwin <https://free-haven.org/profile/tony>
 * Author: Tobias Diekershoff <https://f.diekershoff.de/u/tobias>
 */
-
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
@@ -52,17 +51,13 @@ function irc_addon_settings(&$a,&$s) {
 
 }
 
-function irc_addon_settings_post(&$a, &$b) {
-	if(!local_user())
+function irc_addon_settings_post(&$a,&$b) {
+	if(! local_user())
 		return;
 
-	if(!empty($_POST['irc-submit'])) {
-		if (isset($_POST['autochans'])) {
-			PConfig::set(local_user(), 'irc', 'autochans', trim(($_POST['autochans'])));
-		}
-		if (isset($_POST['sitechats'])) {
-			PConfig::set(local_user(), 'irc', 'sitechats', trim($_POST['sitechats']));
-		}
+	if($_POST['irc-submit']) {
+		PConfig::set( local_user(), 'irc','autochans',trim($_POST['autochans']));
+		PConfig::set( local_user(), 'irc','sitechats',trim($_POST['sitechats']));
 		/* upid pop-up thing */
 		info(L10n::t('IRC settings saved.') . EOL);
 	}
diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index 922f557c..2ec92509 100644
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -7,7 +7,7 @@
  *         Hauke Altmann <https://snarl.de/profile/tugelblend>
  * 
  */
-
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
@@ -61,15 +61,13 @@ function pageheader_addon_settings(&$a,&$s) {
 
 }
 
-function pageheader_addon_settings_post(&$a, &$b) {
+function pageheader_addon_settings_post(&$a,&$b) {
 
-	if(!is_site_admin())
+	if(! is_site_admin())
 		return;
 
-	if(!empty($_POST['pageheader-submit'])) {
-		if (isset($_POST['pageheader-words'])) {
-			Config::set('pageheader', 'text', trim(strip_tags($_POST['pageheader-words'])));
-		}
+	if($_POST['pageheader-submit']) {
+		Config::set('pageheader','text',trim(strip_tags($_POST['pageheader-words'])));
 		info(L10n::t('pageheader Settings saved.') . EOL);
 	}
 }