diff --git a/src/AVP.sh b/src/AVP.sh
index 1eff2d809e6765593464c51ce1764386f016a8ce..d140fb9d5c8cf7bce8c14d7e208da8e17be5df51 100755
--- a/src/AVP.sh
+++ b/src/AVP.sh
@@ -38,7 +38,7 @@
 #set -x
 
 # AVP.sh [OPTION] ... DDF-FILEs
-# {-v <variable-name>=<value>} {DDF-files} 
+# {-v <variable-name>=<value>} {DDF-files}
 
 AVPSCRIPT="AVP.awk"
 AVPENCDECSCRIPT="AVP_encdec.awk"
@@ -50,7 +50,7 @@ ENCDECFILE="DIAMETER_EncDec.cc"
 UTF8ENC=""
 
 
-if [ $# -lt 1 ]; then 
+if [ $# -lt 1 ]; then
   echo "ERROR: Too few arguments"
   echo "Usage: $0 [-vNAME=VALUE] ... DDF-FILEs"
   echo "Where: -v sets variable NAME to VALUE"
@@ -59,7 +59,7 @@ if [ $# -lt 1 ]; then
   echo "  module_id ................ Name of generated TTCN-3 module"
   echo "  use_application_revision . Use revision prefix in AVP identifier"
   echo "  enum_2_Unsigned32 ........ Replace enumeration AVPs with Unsigned32"
-  echo "  use_UTF8_encoding ........ Use UTF8 encoding for AVP_UTF8String"  
+  echo "  use_UTF8_encoding ........ Use UTF8 encoding for AVP_UTF8String"
   exit 1
 fi
 
@@ -83,11 +83,11 @@ AWKARGS=$@
 while [ $# -ge 1 ]; do
   case $1 in
   -v)
-      shift; 
+      shift;
       case $1 in
       module_id=*)
         TTCN3FILE=`echo $1 | sed 's/module_id=//'`
-        if [ -f "DIAMETER_EncDec.cc" ]; then 
+        if [ -f "DIAMETER_EncDec.cc" ]; then
           cmd="s/#include \"DIAMETER_Types.hh\"/#include \"${TTCN3FILE}.hh\"/
                s/namespace DIAMETER__Types/namespace ${TTCN3FILE}/
                s/DIAMETER_EncDec/${TTCN3FILE}_DIAMETER_EncDec/g"
@@ -106,22 +106,22 @@ while [ $# -ge 1 ]; do
       detailed_bits=*)
         USEDETAILED_BITS="YES"
         ;;
-      enum_2_Unsigned32=*) 
+      enum_2_Unsigned32=*)
         ;;
-      enum_2_Unsigned32_list=*) 
+      enum_2_Unsigned32_list=*)
         ;;
-      disable_prefix=*) 
+      disable_prefix=*)
         ;;
       custom_enc=*)
         CUSTOMENC="YES"
         ;;
       use_UTF8_encoding=*)
 	UTF8ENC="YES"
-	;;	
+	;;
       *) echo "ERROR: Unknown variable $1!"; exit 1;;
       esac
       ;;
-  *) 
+  *)
      # end of options
      if [ $# -lt 1 ]; then
        echo "ERROR: No input DDF file"
@@ -129,10 +129,10 @@ while [ $# -ge 1 ]; do
      fi
      # check if custom_enc is defined when use_UTF8_encoding is used
      if [ "$UTF8ENC" = "YES" ]; then
-       if [ "$CUSTOMENC" = "" ]; then     
+       if [ "$CUSTOMENC" = "" ]; then
         echo "ERROR: No custom_enc defined. It is needed for use_UTF8_encoding!"
-        exit 1       
-       fi  
+        exit 1
+       fi
      fi
      ddf_files=$@
      # check gawk existence
@@ -169,16 +169,16 @@ while [ $# -ge 1 ]; do
          echo "#define DPMG_USE_UTF8_ENC" >> $ENCDECFILE
        fi
        cat $comm_dir_name/DIAMETER_EncDec.tpl >> $ENCDECFILE
-       
+
        ext_cc_tpls=`grep -h "EXT_CC:" $ddf_files | cut -d : -f 2`
        if [ "$ext_cc_tpls" ]
        then
          for i in $ext_cc_tpls
          do
            if [ -f $i ]
-           then 
+           then
              cat $i >> $ENCDECFILE
-           else 
+           else
              cat $comm_dir_name/$i >> $ENCDECFILE
            fi
          done