diff --git a/src/zcl_excel_theme.clas.abap b/src/zcl_excel_theme.clas.abap
index 75c3323..c712349 100644
--- a/src/zcl_excel_theme.clas.abap
+++ b/src/zcl_excel_theme.clas.abap
@@ -24,10 +24,10 @@ CLASS zcl_excel_theme DEFINITION
         VALUE(rv_xstring) TYPE xstring .
     METHODS set_color
       IMPORTING
-        VALUE(iv_type)         TYPE string
-        VALUE(iv_srgb)         TYPE zcl_excel_theme_color_scheme=>t_srgb OPTIONAL
-        VALUE(iv_syscolorname) TYPE string OPTIONAL
-        VALUE(iv_syscolorlast) TYPE zcl_excel_theme_color_scheme=>t_srgb OPTIONAL .
+        iv_type         TYPE string
+        iv_srgb         TYPE zcl_excel_theme_color_scheme=>t_srgb OPTIONAL
+        iv_syscolorname TYPE string OPTIONAL
+        iv_syscolorlast TYPE zcl_excel_theme_color_scheme=>t_srgb OPTIONAL .
     METHODS set_color_scheme_name
       IMPORTING
         iv_name TYPE string .
@@ -38,31 +38,31 @@ CLASS zcl_excel_theme DEFINITION
         iv_typeface TYPE string .
     METHODS set_latin_font
       IMPORTING
-        VALUE(iv_type)        TYPE string
-        VALUE(iv_typeface)    TYPE string
-        VALUE(iv_panose)      TYPE string OPTIONAL
-        VALUE(iv_pitchfamily) TYPE string OPTIONAL
-        VALUE(iv_charset)     TYPE string OPTIONAL .
+        iv_type        TYPE string
+        iv_typeface    TYPE string
+        iv_panose      TYPE string OPTIONAL
+        iv_pitchfamily TYPE string OPTIONAL
+        iv_charset     TYPE string OPTIONAL .
     METHODS set_ea_font
       IMPORTING
-        VALUE(iv_type)        TYPE string
-        VALUE(iv_typeface)    TYPE string
-        VALUE(iv_panose)      TYPE string OPTIONAL
-        VALUE(iv_pitchfamily) TYPE string OPTIONAL
-        VALUE(iv_charset)     TYPE string OPTIONAL .
+        iv_type        TYPE string
+        iv_typeface    TYPE string
+        iv_panose      TYPE string OPTIONAL
+        iv_pitchfamily TYPE string OPTIONAL
+        iv_charset     TYPE string OPTIONAL .
     METHODS set_cs_font
       IMPORTING
-        VALUE(iv_type)        TYPE string
-        VALUE(iv_typeface)    TYPE string
-        VALUE(iv_panose)      TYPE string OPTIONAL
-        VALUE(iv_pitchfamily) TYPE string OPTIONAL
-        VALUE(iv_charset)     TYPE string OPTIONAL .
+        iv_type        TYPE string
+        iv_typeface    TYPE string
+        iv_panose      TYPE string OPTIONAL
+        iv_pitchfamily TYPE string OPTIONAL
+        iv_charset     TYPE string OPTIONAL .
     METHODS set_font_scheme_name
       IMPORTING
-        VALUE(iv_name) TYPE string .
+        iv_name TYPE string .
     METHODS set_theme_name
       IMPORTING
-        VALUE(iv_name) TYPE string .
+        iv_name TYPE string .
   PROTECTED SECTION.
 
     DATA elements TYPE REF TO zcl_excel_theme_elements .
diff --git a/src/zcl_excel_theme_color_scheme.clas.abap b/src/zcl_excel_theme_color_scheme.clas.abap
index c5b2222..eb0cc04 100644
--- a/src/zcl_excel_theme_color_scheme.clas.abap
+++ b/src/zcl_excel_theme_color_scheme.clas.abap
@@ -54,7 +54,7 @@ CLASS zcl_excel_theme_color_scheme DEFINITION
     METHODS constructor .
     METHODS set_name
       IMPORTING
-        VALUE(iv_name) TYPE string .
+        iv_name TYPE string .
   PROTECTED SECTION.
 
     DATA name TYPE string .
diff --git a/src/zcl_excel_theme_font_scheme.clas.abap b/src/zcl_excel_theme_font_scheme.clas.abap
index 15313d8..216c2fa 100644
--- a/src/zcl_excel_theme_font_scheme.clas.abap
+++ b/src/zcl_excel_theme_font_scheme.clas.abap
@@ -58,41 +58,41 @@ CLASS zcl_excel_theme_font_scheme DEFINITION
         !io_document TYPE REF TO if_ixml_document .
     METHODS modify_font
       IMPORTING
-        VALUE(iv_type)     TYPE string
-        VALUE(iv_script)   TYPE string
-        VALUE(iv_typeface) TYPE string .
+        iv_type     TYPE string
+        iv_script   TYPE string
+        iv_typeface TYPE string .
     METHODS modify_latin_font
       IMPORTING
-        VALUE(iv_type)        TYPE string
-        VALUE(iv_typeface)    TYPE string
-        VALUE(iv_panose)      TYPE string OPTIONAL
-        VALUE(iv_pitchfamily) TYPE string OPTIONAL
-        VALUE(iv_charset)     TYPE string OPTIONAL .
+        iv_type        TYPE string
+        iv_typeface    TYPE string
+        iv_panose      TYPE string OPTIONAL
+        iv_pitchfamily TYPE string OPTIONAL
+        iv_charset     TYPE string OPTIONAL .
     METHODS modify_ea_font
       IMPORTING
-        VALUE(iv_type)        TYPE string
-        VALUE(iv_typeface)    TYPE string
-        VALUE(iv_panose)      TYPE string OPTIONAL
-        VALUE(iv_pitchfamily) TYPE string OPTIONAL
-        VALUE(iv_charset)     TYPE string OPTIONAL .
+        iv_type        TYPE string
+        iv_typeface    TYPE string
+        iv_panose      TYPE string OPTIONAL
+        iv_pitchfamily TYPE string OPTIONAL
+        iv_charset     TYPE string OPTIONAL .
     METHODS modify_cs_font
       IMPORTING
-        VALUE(iv_type)        TYPE string
-        VALUE(iv_typeface)    TYPE string
-        VALUE(iv_panose)      TYPE string OPTIONAL
-        VALUE(iv_pitchfamily) TYPE string OPTIONAL
-        VALUE(iv_charset)     TYPE string OPTIONAL .
+        iv_type        TYPE string
+        iv_typeface    TYPE string
+        iv_panose      TYPE string OPTIONAL
+        iv_pitchfamily TYPE string OPTIONAL
+        iv_charset     TYPE string OPTIONAL .
     METHODS constructor .
   PROTECTED SECTION.
 
     METHODS modify_lec_fonts
       IMPORTING
-        VALUE(iv_type)        TYPE string
-        VALUE(iv_font_type)   TYPE string
-        VALUE(iv_typeface)    TYPE string
-        VALUE(iv_panose)      TYPE string OPTIONAL
-        VALUE(iv_pitchfamily) TYPE string OPTIONAL
-        VALUE(iv_charset)     TYPE string OPTIONAL .
+        iv_type        TYPE string
+        iv_font_type   TYPE string
+        iv_typeface    TYPE string
+        iv_panose      TYPE string OPTIONAL
+        iv_pitchfamily TYPE string OPTIONAL
+        iv_charset     TYPE string OPTIONAL .
   PRIVATE SECTION.
 
     DATA font_scheme TYPE t_scheme .
diff --git a/src/zcl_excel_worksheet.clas.abap b/src/zcl_excel_worksheet.clas.abap
index a94d403..6ee2401 100644
--- a/src/zcl_excel_worksheet.clas.abap
+++ b/src/zcl_excel_worksheet.clas.abap
@@ -73,8 +73,10 @@ CLASS zcl_excel_worksheet DEFINITION
         col_from TYPE i,
         col_to   TYPE i,
       END OF mty_merge .
-    TYPES:
+  TYPES:
       mty_ts_merge TYPE SORTED TABLE OF mty_merge WITH UNIQUE KEY table_line .
+*  mty_ts_merge TYPE  TABLE OF mty_merge WITH UNIQUE SORTED KEY sort_key COMPONENTS row_from row_to.
+
     TYPES:
       ty_area TYPE c LENGTH 1 .
 
@@ -814,7 +816,7 @@ ENDCLASS.
 
 
 
-CLASS zcl_excel_worksheet IMPLEMENTATION.
+CLASS ZCL_EXCEL_WORKSHEET IMPLEMENTATION.
 
 
   METHOD add_comment.