diff --git a/include/cron_maintain.php b/include/cron_maintain.php
index 99772591..c5c14200 100644
--- a/include/cron_maintain.php
+++ b/include/cron_maintain.php
@@ -1,10 +1,10 @@
 <?php
 
+use Friendica\Directory\App;
+
 //Startup.
 require_once 'boot.php';
 
-use Friendica\Directory\App;
-
 // Debug stuff.
 // ini_set('display_errors', 1);
 // ini_set('log_errors','0');
@@ -14,7 +14,7 @@ $start_maintain = time();
 
 $verbose = $argv[1] === 'verbose';
 
-$a = new App;
+$a = new App();
 
 //Config and DB.
 require_once '.htconfig.php';
diff --git a/include/cron_sync.php b/include/cron_sync.php
index e9d2eb17..d27a3fbd 100644
--- a/include/cron_sync.php
+++ b/include/cron_sync.php
@@ -40,11 +40,11 @@
 
  */
 
+use Friendica\Directory\App;
+
 //Startup.
 require_once 'boot.php';
 
-use Friendica\Directory\App;
-
 // Debug stuff.
 ini_set('display_errors', 1);
 ini_set('log_errors', '0');
@@ -52,7 +52,7 @@ error_reporting(E_ALL ^ E_NOTICE);
 
 $start_syncing = time();
 
-$a = new App;
+$a = new App();
 
 //Create a simple log function for CLI use.
 global $verbose;
diff --git a/include/directory.php b/include/directory.php
index 01d00e02..114abb37 100644
--- a/include/directory.php
+++ b/include/directory.php
@@ -1,11 +1,11 @@
 <?php
 
+use Friendica\Directory\App;
+
 //Startup.
 require_once 'boot.php';
 
-use Friendica\Directory\App;
-
-$a = new App;
+$a = new App();
 
 @include '.htconfig.php';
 
diff --git a/include/notifier.php b/include/notifier.php
index 5d678a40..03885464 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -1,11 +1,11 @@
 <?php
 
+use Friendica\Directory\App;
+
 //Startup.
 require_once 'boot.php';
 
-use Friendica\Directory\App;
-
-$a = new App;
+$a = new App();
 
 @include '.htconfig.php';
 
diff --git a/include/poller.php b/include/poller.php
index 335201b4..30fff7ef 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -1,11 +1,11 @@
 <?php
 
+use Friendica\Directory\App;
+
 //Startup.
 require_once 'boot.php';
 
-use Friendica\Directory\App;
-
-$a = new App;
+$a = new App();
 
 @include('.htconfig.php');
 
diff --git a/include/rockstar.php b/include/rockstar.php
index 0891a043..eeb70234 100644
--- a/include/rockstar.php
+++ b/include/rockstar.php
@@ -1,11 +1,11 @@
 <?php
 
+use Friendica\Directory\App;
+
 //Startup.
 require_once 'boot.php';
 
-use Friendica\Directory\App;
-
-$a = new App;
+$a = new App();
 
 @include(".htconfig.php");
 require_once 'dba.php';
diff --git a/index.php b/index.php
index 1a53c184..c3c083a3 100644
--- a/index.php
+++ b/index.php
@@ -1,10 +1,10 @@
 <?php
 
-require_once 'boot.php';
-
 use Friendica\Directory\App;
 
-$a = new App;
+require_once 'boot.php';
+
+$a = new App();
 
 error_reporting(E_ERROR | E_WARNING | E_PARSE);
 error_reporting(E_ALL);
diff --git a/src/Core/Console/Config.php b/src/Core/Console/Config.php
index 3eb98035..258c7204 100644
--- a/src/Core/Console/Config.php
+++ b/src/Core/Console/Config.php
@@ -7,7 +7,6 @@ use dba;
 use Friendica\Core;
 
 require_once 'include/dba.php';
-require_once 'include/text.php';
 
 /**
  * @brief tool to access the system config from the CLI
diff --git a/src/Core/Console/Probe.php b/src/Core/Console/Probe.php
index 41eff0a3..53de2aaa 100644
--- a/src/Core/Console/Probe.php
+++ b/src/Core/Console/Probe.php
@@ -5,6 +5,7 @@ namespace Friendica\Directory\Core\Console;
 use Asika\SimpleConsole\CommandArgsException;
 use Asika\SimpleConsole\Console;
 use dba;
+use Friendica\Directory\App;
 use Net_Ping;
 
 require_once 'include/dba.php';
@@ -42,7 +43,7 @@ HELP;
 	{
 		global $db, $a;
 
-        $a = new \Friendica\Directory\App();
+        $a = new App();
 
 		if ($this->getOption('v')) {
 			$this->out('Class: ' . __CLASS__);