diff --git a/debian/scripts/maintenance.sh b/debian/scripts/maintenance.sh
index 37bfe9d..11aa914 100644
--- a/debian/scripts/maintenance.sh
+++ b/debian/scripts/maintenance.sh
@@ -21,17 +21,17 @@ display_help() {
   echo ''
   echo "COMMANDS"
   echo "------------------"
-  echo "       status     > gives the current state of maintenance mode"
+  echo "       status     > reports the current state of maintenance mode"
   echo "       on         > switches mantenance mode ON"
-  echo "       off        > switches mantenance mode OFF and shuts down/ restarts container"
-  echo "       upgrade    > will put container to maintenance mode and upgrade iobroker"
+  echo "       off        > switches mantenance mode OFF and shuts down or restarts container"
+  echo "       upgrade    > will put container to maintenance mode and upgrade ioBroker"
   echo "       help       > shows this help"
   echo ''
   echo "OPTIONS"
   echo "------------------"
   echo "       -y|--yes   > confirms the used command without asking"
-  echo "       -h|--help  > shows this help"  
-  echo ''  
+  echo "       -h|--help  > shows this help"
+  echo ''
   exit 0
 }
 
@@ -101,11 +101,11 @@ switch_off() {
   if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ] && [ "$autoconfirm" == "no" ] # maintenance mode ON / autoconfirm = no
   then
     echo 'You are now going to deactivate maintenance mode for this container.'
-    echo 'Depending on the restart policy, your container will be stopped/ restarted immediately.'
+    echo 'Depending on the restart policy, your container will be stopped or restarted immediately.'
     read -p 'Do you want to continue [yes/no]? ' A
     if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
     then
-      echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
+      echo 'Deactivating maintenance mode and forcing container to stop or restart...'
       echo "stopping" > /opt/scripts/.docker_config/.healthcheck
       pkill -u root
       echo 'Done.'
@@ -116,9 +116,9 @@ switch_off() {
   elif [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ] && [ "$autoconfirm" == "yes" ] # maintenance mode ON / autoconfirm = yes
   then
     echo 'You are now going to deactivate maintenance mode for this container.'
-    echo 'Depending on the restart policy, your container will be stopped/ restarted immediately.'
+    echo 'Depending on the restart policy, your container will be stopped or restarted immediately.'
     echo 'This command was already confirmed by -y or --yes option.'
-    echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
+    echo 'Deactivating maintenance mode and forcing container to stop or restart...'
     echo "stopping" > /opt/scripts/.docker_config/.healthcheck
     pkill -u root
     echo 'Done.'
@@ -130,62 +130,43 @@ switch_off() {
 
 # upgrade js-controller
 upgrade() {
+  echo 'You are now going to upgrade your js-controller.'
+  echo 'As this will change data in /opt/iobroker, make sure you have a backup!'
+  echo 'During the upgrade process the container will automatically switch into maintenance mode and stop ioBroker.'
+  echo 'Depending of the restart policy, your container will be stopped or restarted automatically after the upgrade.'
+
   if [ "$autoconfirm" == "no" ]
-  then 
-    echo 'You are now going to upgrade your js-controller.'
-    echo 'As this will change data in /opt/iobroker, make sure you have a backup!'
-    echo 'During the upgrade process the container will automatically switch into maintenance mode and stop ioBroker.'
-    echo 'Depending of the restart policy, you container will be stoped/ restarted automatically after the upgrade.'
+  then
     read -p 'Do you want to continue [yes/no]? ' A
     if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
     then
-      echo 'Activating maintenance mode...'
-      echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
-      sleep 1
-      echo 'Done.'
-      echo 'Stopping ioBroker...'
-      pkill -u iobroker
-      sleep 1
-      echo 'Done.'
-      echo 'Upgrading js-controller...'
-      iobroker update
-      iobroker upgrade self
-      sleep 1
-      echo 'Done.'
-      echo 'Container will be stopped/ restarted in 5 seconds...'
-      sleep 5
-      echo "stopping" > /opt/scripts/.docker_config/.healthcheck
-      pkill -u root
-      exit 0
+      : # Continue.
     else
       exit 0
     fi
   elif [ "$autoconfirm" == "yes" ]
-  then 
-     echo 'You are now going to upgrade your js-controller.'
-    echo 'As this will change data in /opt/iobroker, make sure you have a backup!'
-    echo 'During the upgrade process the container will automatically switch into maintenance mode and stop ioBroker.'
-    echo 'Depending of the restart policy, you container will be stoped/ restarted automatically after the upgrade.'
+  then
     echo 'This command was already confirmed by -y or --yes option.'
-    echo 'Activating maintenance mode...'
-    echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
-    sleep 1
-    echo 'Done.'
-    echo 'Stopping ioBroker...'
-    pkill -u iobroker
-    sleep 1
-    echo 'Done.'
-    echo 'Upgrading js-controller...'
-    iobroker update
-    iobroker upgrade self
-    sleep 1
-    echo 'Done.'
-    echo 'Container will be stopped/ restarted in 5 seconds...'
-    sleep 5
-    echo "stopping" > /opt/scripts/.docker_config/.healthcheck
-    pkill -u root
-    exit 0
   fi
+
+  echo 'Activating maintenance mode...'
+  echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
+  sleep 1
+  echo 'Done.'
+  echo 'Stopping ioBroker...'
+  pkill -u iobroker
+  sleep 1
+  echo 'Done.'
+  echo 'Upgrading js-controller...'
+  iobroker update
+  iobroker upgrade self
+  sleep 1
+  echo 'Done.'
+  echo 'Container will be stopped or restarted in 5 seconds...'
+  sleep 5
+  echo "stopping" > /opt/scripts/.docker_config/.healthcheck
+  pkill -u root
+  exit 0
 }
 
 ########################################
@@ -198,7 +179,7 @@ for i in "$@"; do
   reverse="$i $reverse"
 done
 
-# checking the arguments 
+# checking the arguments
 for i in $reverse; do
   case $i in
     help|-h|--help)