diff --git a/include/cron.php b/include/cron.php
index d2471c2bf..0ae336e33 100644
--- a/include/cron.php
+++ b/include/cron.php
@@ -1,8 +1,8 @@
 <?php
 use \Friendica\Core\Config;
 
-require_once("include/photos.php");
-require_once("include/user.php");
+require_once('include/photos.php');
+require_once('include/user.php');
 
 function cron_run(&$argv, &$argc){
 	global $a;
diff --git a/include/cronhooks.php b/include/cronhooks.php
index af5ab9f92..8fa62e1b9 100644
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -16,7 +16,7 @@ function cronhooks_run(&$argv, &$argc){
 		return;
 	}
 
-	$last = get_config('system','last_cronhook');
+	$last = get_config('system', 'last_cronhook');
 
 	$poll_interval = intval(get_config('system','cronhook_interval'));
 	if(! $poll_interval)
diff --git a/include/dbupdate.php b/include/dbupdate.php
index 21528c573..725eca737 100644
--- a/include/dbupdate.php
+++ b/include/dbupdate.php
@@ -7,7 +7,7 @@ function dbupdate_run(&$argv, &$argc) {
 
 	// We are deleting the latest dbupdate entry.
 	// This is done to avoid endless loops because the update was interupted.
-	Config::delete('database','dbupdate_'.DB_UPDATE_VERSION);
+	Config::delete('database', 'dbupdate_'.DB_UPDATE_VERSION);
 
 	update_db($a);
 }
diff --git a/include/delivery.php b/include/delivery.php
index 5950c48bb..c48e606f4 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -4,15 +4,15 @@ use \Friendica\Core\Config;
 
 require_once('include/queue_fn.php');
 require_once('include/html2plain.php');
-require_once("include/Scrape.php");
+require_once('include/Scrape.php');
 require_once('include/diaspora.php');
-require_once("include/ostatus.php");
-require_once("include/dfrn.php");
+require_once('include/ostatus.php');
+require_once('include/dfrn.php');
 
 function delivery_run(&$argv, &$argc){
 	global $a;
 
-	require_once("include/datetime.php");
+	require_once('include/datetime.php');
 	require_once('include/items.php');
 	require_once('include/bbcode.php');
 	require_once('include/email.php');
diff --git a/include/directory.php b/include/directory.php
index 057c156ad..088adbe78 100644
--- a/include/directory.php
+++ b/include/directory.php
@@ -6,7 +6,7 @@ function directory_run(&$argv, &$argc){
 		return;
 	}
 
-	$dir = get_config('system','directory');
+	$dir = get_config('system', 'directory');
 
 	if (!strlen($dir)) {
 		return;
diff --git a/include/discover_poco.php b/include/discover_poco.php
index bfde3c46d..0384483a4 100644
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -2,7 +2,7 @@
 
 use \Friendica\Core\Config;
 
-require_once("include/socgraph.php");
+require_once('include/socgraph.php');
 require_once('include/datetime.php');
 
 function discover_poco_run(&$argv, &$argc){
diff --git a/include/gprobe.php b/include/gprobe.php
index 2f1758f37..719cfce48 100644
--- a/include/gprobe.php
+++ b/include/gprobe.php
@@ -7,9 +7,9 @@ require_once('include/socgraph.php');
 require_once('include/datetime.php');
 
 function gprobe_run(&$argv, &$argc){
-	if($argc != 2)
+	if ($argc != 2) {
 		return;
-
+	}
 	$url = hex2bin($argv[1]);
 
 	$r = q("SELECT `id`, `url`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 1",
diff --git a/include/notifier.php b/include/notifier.php
index c05d00e63..ada871e92 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -4,9 +4,9 @@ use \Friendica\Core\Config;
 
 require_once('include/queue_fn.php');
 require_once('include/html2plain.php');
-require_once("include/Scrape.php");
+require_once('include/Scrape.php');
 require_once('include/diaspora.php');
-require_once("include/ostatus.php");
+require_once('include/ostatus.php');
 require_once('include/salmon.php');
 
 /*
@@ -45,7 +45,7 @@ require_once('include/salmon.php');
 function notifier_run(&$argv, &$argc){
 	global $a;
 
-	require_once("include/datetime.php");
+	require_once('include/datetime.php');
 	require_once('include/items.php');
 	require_once('include/bbcode.php');
 	require_once('include/email.php');
diff --git a/include/onepoll.php b/include/onepoll.php
index 30a21129d..43c4495b6 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -2,7 +2,7 @@
 
 use \Friendica\Core\Config;
 
-require_once("include/follow.php");
+require_once('include/follow.php');
 
 function RemoveReply($subject) {
 	while (in_array(strtolower(substr($subject, 0, 3)), array("re:", "aw:")))
diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php
index f88ca98a4..3641bbcf7 100644
--- a/include/pubsubpublish.php
+++ b/include/pubsubpublish.php
@@ -2,7 +2,7 @@
 use \Friendica\Core\Config;
 
 require_once('include/items.php');
-require_once("include/ostatus.php");
+require_once('include/ostatus.php');
 
 function pubsubpublish_run(&$argv, &$argc){
 
diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index f59f48765..08d4149a7 100644
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -6,14 +6,15 @@ function update_gcontact_run(&$argv, &$argc){
 	global $a;
 
 	require_once('include/Scrape.php');
-	require_once("include/socgraph.php");
+	require_once('include/socgraph.php');
 
 	logger('update_gcontact: start');
 
-	if(($argc > 1) && (intval($argv[1])))
+	if (($argc > 1) && (intval($argv[1]))) {
 		$contact_id = intval($argv[1]);
+	}
 
-	if(!$contact_id) {
+	if (!$contact_id) {
 		logger('update_gcontact: no contact');
 		return;
 	}