diff --git a/CHANGELOG.md b/CHANGELOG.md
index e588a72..48a8bd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,9 @@
-2021.09.25.1 - dev
+dev
 - [ ] help translation
 - [ ] source translation
 - [ ] fix third-party API (temp removed)
+- sort modules by id
+- fix extra whitespace in exported files
 
 2021.09.28
 - Fix help (thx Pierre Van Glabeke)
diff --git a/_uninstall.php b/_uninstall.php
index 7a354cc..38095a6 100644
--- a/_uninstall.php
+++ b/_uninstall.php
@@ -15,67 +15,67 @@ if (!defined('DC_CONTEXT_ADMIN')) {
 }
 
 $this->addUserAction(
-    /* type */ 
+    /* type */
     'settings',
-    /* action */ 
+    /* action */
     'delete_all',
-    /* ns */ 
+    /* ns */
     'translater',
-    /* description */ 
+    /* description */
     __('delete all settings')
 );
 
 $this->addUserAction(
-    /* type */ 
+    /* type */
     'plugins',
-    /* action */ 
+    /* action */
     'delete',
-    /* ns */ 
+    /* ns */
     'translater',
-    /* description */ 
+    /* description */
     __('delete plugin files')
 );
 
 $this->addUserAction(
-    /* type */ 
+    /* type */
     'versions',
-    /* action */ 
+    /* action */
     'delete',
-    /* ns */ 
+    /* ns */
     'translater',
-    /* description */ 
+    /* description */
     __('delete the version number')
 );
 
 $this->addDirectAction(
-    /* type */ 
+    /* type */
     'settings',
-    /* action */ 
+    /* action */
     'delete_all',
-    /* ns */ 
+    /* ns */
     'translater',
-    /* description */ 
+    /* description */
     sprintf(__('delete all %s settings'), 'translater')
 );
 
 $this->addDirectAction(
-    /* type */ 
+    /* type */
     'plugins',
-    /* action */ 
+    /* action */
     'delete',
-    /* ns */ 
+    /* ns */
     'translater',
-    /* description */ 
+    /* description */
     sprintf(__('delete %s plugin files'), 'translater')
 );
 
 $this->addDirectAction(
-    /* type */ 
+    /* type */
     'versions',
-    /* action */ 
+    /* action */
     'delete',
-    /* ns */ 
+    /* ns */
     'translater',
-    /* description */ 
+    /* description */
     sprintf(__('delete %s version number'), 'translater')
 );
diff --git a/inc/class.dc.translater.module.php b/inc/class.dc.translater.module.php
index c597e30..6bc5cf8 100644
--- a/inc/class.dc.translater.module.php
+++ b/inc/class.dc.translater.module.php
@@ -412,7 +412,7 @@ class dcTranslaterModule
         $is_file = preg_match('/^(.*?)\/locales\/(.*?)\/(.*?)(.po|.lang.php)$/', $file, $f);
 
         if ($is_file) {
-            $module = $f[1] == $this->prop['id'] ?$f[1] : false;
+            $module = $f[1] == $this->prop['id'] ? $f[1] : false;
             $lang   = l10n::isCode($f[2]) ? $f[2] : false;
             $group  = in_array($f[3], dctranslater::$allowed_l10n_groups) ? $f[3] : false;
             $ext    = dctranslater::isLangphpFile($f[4]) || dctranslater::isPoFile($f[4]) ? $f[4] : false;
diff --git a/inc/class.translater.proposals.php b/inc/class.translater.proposals.php
index 43f86b2..c8b0628 100644
--- a/inc/class.translater.proposals.php
+++ b/inc/class.translater.proposals.php
@@ -10,7 +10,6 @@
  * @copyright Jean-Christian Denis
  * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
-
 /**
  * Translater proposal tools container.
  */
diff --git a/inc/lib.translater.proposal.php b/inc/lib.translater.proposal.php
index e3c4e88..32f641c 100644
--- a/inc/lib.translater.proposal.php
+++ b/inc/lib.translater.proposal.php
@@ -10,7 +10,6 @@
  * @copyright Jean-Christian Denis
  * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
  */
-
 /**
  * Translater proposal tool.
  *
@@ -80,7 +79,7 @@ abstract class translaterProposalTool
      */
     final protected function setActive($active)
     {
-        $this->active = (boolean) $active;
+        $this->active = (bool) $active;
     }
 
     /**