diff --git a/include/profiles b/include/profiles
index db20d4fa..8ec98326 100644
--- a/include/profiles
+++ b/include/profiles
@@ -101,6 +101,7 @@
             # Profile name
             profile_name)
                 # YYY dummy 
+                PROFILE_NAME="${VALUE}"
             ;;
 
             # Inline tips about tool
@@ -121,9 +122,9 @@
 
             # Define what kind of scan we are performing
             test_scan_mode)
-                if [ "${VALUE}" = "light" ]; then	     SCAN_TEST_LIGHT="YES";   SCAN_TEST_MEDIUM="NO";   SCAN_TEST_HEAVY="NO";	   fi
-                if [ "${VALUE}" = "normal" ]; then	     SCAN_TEST_LIGHT="YES";   SCAN_TEST_MEDIUM="YES";  SCAN_TEST_HEAVY="NO";	   fi
-                if [ "${VALUE}" = "full" ]; then	     SCAN_TEST_LIGHT="YES";   SCAN_TEST_MEDIUM="YES";  SCAN_TEST_HEAVY="YES";	   fi
+                if [ "${VALUE}" = "light" ]; then   SCAN_TEST_LIGHT="YES"; SCAN_TEST_MEDIUM="NO";  SCAN_TEST_HEAVY="NO";  fi
+                if [ "${VALUE}" = "normal" ]; then  SCAN_TEST_LIGHT="YES"; SCAN_TEST_MEDIUM="YES"; SCAN_TEST_HEAVY="NO";  fi
+                if [ "${VALUE}" = "full" ]; then    SCAN_TEST_LIGHT="YES"; SCAN_TEST_MEDIUM="YES"; SCAN_TEST_HEAVY="YES"; fi
             ;;
 
             # Catch all bad options and bail out
@@ -131,8 +132,7 @@
                 logtext "Unknown option ${OPTION} (with value: ${VALUE})"
                 echo "Fatal error: found errors in profile"
                 echo "Unknown option '${OPTION}' found (with value: ${VALUE})"
-                RemovePIDFile    
-                exit 1
+                ExitFatal
             ;;
 
         esac
@@ -147,23 +147,6 @@
     fi
 #
 #################################################################################
-#
-# Plugins
-#
-#################################################################################
-#
-    #FIND=`cat ${PROFILE} | grep '^plugin_enable=' | sed 's/ /!space!/g'`
-    #for I in ${FIND}; do
-    #    PLUGIN=`echo ${I} | cut -d '=' -f2`
-    #    if [ -f "${PLUGINDIR}/${PLUGIN}" ]; then
-    #        logtext "Found plugin: ${PLUGIN}"
-    #        # XXX - enable plugin
-    #      else
-    #        logtext "Couldn't find plugin: ${PLUGIN} (${PLUGINDIR}/${PLUGIN})"
-    #    fi
-    #done
-#
-#################################################################################
 #
     # Set default values (only if not configured in profile)
 
@@ -184,4 +167,4 @@
 logtextbreak
 
 #================================================================================
-# Lynis - Copyright 2007-2014, Michael Boelen - cisofy.com - The Netherlands
+# Lynis - Copyright 2007-2014, Michael Boelen - CISOfy, https://cisofy.com