diff --git a/scripts/_common.sh b/scripts/_common.sh
index a854a50..6bca857 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -8,8 +8,8 @@
 # PERSONAL HELPERS
 #=================================================
 ntfy_setup_source {
-    $YNH_ARCH=$1
-    $install_dir=$2
+    # $YNH_ARCH=$1
+    # $install_dir=$2
 
     ynh_setup_source -d "$install_dir" -a "$YNH_ARCH"
     ynh_secure_remove --file=$install_dir/client
@@ -19,9 +19,9 @@ ntfy_setup_source {
 }
 
 ntfy_fix_permissions {
-    $app=$1
-    $install_dir=$2
-    
+    # $app=$1
+    # $install_dir=$2
+
     chmod o+w "$install_dir/data"
     chmod 400 "$install_dir/server.yml"
     chown $app:$app "$install_dir/server.yml"
diff --git a/scripts/backup b/scripts/backup
index 690d747..93654c3 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
+source ../settings/scripts/_common.sh
 
 ynh_backup -s "$install_dir"
 ynh_backup -s "/etc/nginx/conf.d/$domain.d/$app.conf"
diff --git a/scripts/change_url b/scripts/change_url
index bb25bcd..dd77415 100755
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-source _common.sh
 source /usr/share/yunohost/helpers
+source _common.sh
 
 ynh_script_progression -m "Updating systemd service..." -w 1
 ynh_add_systemd_config
diff --git a/scripts/install b/scripts/install
index 49f9a5f..9bd6d2f 100755
--- a/scripts/install
+++ b/scripts/install
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-source _common.sh
 source /usr/share/yunohost/helpers
+source _common.sh
 
 ynh_script_progression -m "Setting up source files..." -w 6
 ntfy_setup_src $YNH_ARCH $install_dir
diff --git a/scripts/remove b/scripts/remove
index 150241b..83790f0 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-source _common.sh
 source /usr/share/yunohost/helpers
+source _common.sh
 
 ynh_script_progression -m "Removing service in YunoHost..." -w 1
 yunohost service remove $app
diff --git a/scripts/upgrade b/scripts/upgrade
index 0cf37c4..4589f91 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-source _common.sh
 source /usr/share/yunohost/helpers
+source _common.sh
 
 ynh_script_progression -m "Checking version..." -w 1
 upgrade_type=$(ynh_check_app_version_changed)