diff --git a/scripts/change_url b/scripts/change_url
index 7e9fd35..156db53 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -19,7 +19,7 @@ ynh_change_url_nginx_config
 #=================================================
 # SPECIFIC MODIFICATIONS
 #=================================================
-ynh_script_progression --message="Applying Nextcloud specific modifications..." --weight=2
+ynh_script_progression --message="Applying $app specific modifications..." --weight=2
 
 # Define a function to execute commands with `occ`
 exec_occ() {
diff --git a/scripts/install b/scripts/install
index 5a97f26..ccfde36 100755
--- a/scripts/install
+++ b/scripts/install
@@ -39,7 +39,7 @@ ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-ynh_script_progression --message="Setting up source files..."
+ynh_script_progression --message="Setting up source files..." --weight=5
 
 # Load the last available version
 source upgrade.d/upgrade.last.sh
@@ -86,7 +86,7 @@ ynh_add_nginx_config
 #=================================================
 # INSTALL NEXTCLOUD
 #=================================================
-ynh_script_progression --message="Installing Nextcloud..." --weight=30
+ynh_script_progression --message="Installing $app..." --weight=30
 
 # Define a function to execute commands with `occ`
 exec_occ() {
@@ -113,7 +113,7 @@ exec_occ maintenance:install \
 #=================================================
 # CONFIGURE NEXTCLOUD
 #=================================================
-ynh_script_progression --message="Configuring Nextcloud..." --weight=8
+ynh_script_progression --message="Configuring $app..." --weight=8
 
 # Set the mysql.utf8mb4 config to true in config.php
 exec_occ config:system:set mysql.utf8mb4 --type boolean --value="true"
diff --git a/scripts/remove b/scripts/remove
index 0d0ff5b..d09cafe 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -10,51 +10,29 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
-# REMOVE NGINX CONFIGURATION
+# REMOVE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..."
+# REMOVE SYSTEMD SERVICE 
+#=================================================
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=5
 
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=2
-
 # Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config
 
-#=================================================
-# REMOVE LOGROTATE CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing logrotate configuration..."
-
 # Remove the app-specific logrotate config
 ynh_remove_logrotate
 
-#=================================================
-# REMOVE FAIL2BAN CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing Fail2Ban configuration..." --weight=8
-
 # Remove the dedicated Fail2Ban config
 ynh_remove_fail2ban_config
 
-#=================================================
-# SPECIFIC REMOVE
-#=================================================
-# REMOVE THE CRON FILE
-#=================================================
-
 # Remove a cron file
 # TODO: Ensure that cron job is not running (How !?)
 ynh_secure_remove --file="/etc/cron.d/$app"
 
-#=================================================
-# CLEAN ACL IN HOME DIRECTORIES
-#=================================================
-
+# Cleaning ACL in home directories
 for i in $(ls /home); do
   # Clean ACL in every directories in /home, except those which start with 'yunohost.'
   [[ ! $i == yunohost.* ]] \