diff --git a/src/zcl_excel_reader_2007.clas.abap b/src/zcl_excel_reader_2007.clas.abap
index df7f72b..5c55965 100644
--- a/src/zcl_excel_reader_2007.clas.abap
+++ b/src/zcl_excel_reader_2007.clas.abap
@@ -282,32 +282,32 @@ CLASS zcl_excel_reader_2007 DEFINITION
         VALUE(rv_style_guid) TYPE zexcel_cell_style .
     METHODS load_theme
       IMPORTING
-        VALUE(iv_path) TYPE string
-        !ip_excel      TYPE REF TO zcl_excel
+        iv_path   TYPE string
+        !ip_excel TYPE REF TO zcl_excel
       RAISING
         zcx_excel .
 
     CONSTANTS: BEGIN OF namespace,
-                 x14ac               TYPE string VALUE 'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac',
-                 vba_project         TYPE string VALUE 'http://schemas.microsoft.com/office/2006/relationships/vbaProject', "#EC NEEDED     for future incorporation of XLSM-reader
-                 c                   TYPE string VALUE 'http://schemas.openxmlformats.org/drawingml/2006/chart',
-                 a                   TYPE string VALUE 'http://schemas.openxmlformats.org/drawingml/2006/main',
-                 xdr                 TYPE string VALUE 'http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing',
-                 mc                  TYPE string VALUE 'http://schemas.openxmlformats.org/markup-compatibility/2006',
-                 r                   TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships',
-                 chart               TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart',
-                 drawing             TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing',
-                 hyperlink           TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink',
-                 image               TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
-                 office_document     TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument',
-                 printer_settings    TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings',
-                 shared_strings      TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings',
-                 styles              TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles',
-                 theme               TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme',
-                 worksheet           TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet',
-                 relationships       TYPE string VALUE 'http://schemas.openxmlformats.org/package/2006/relationships',
-                 core_properties     TYPE string VALUE 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties',
-                 main                TYPE string VALUE 'http://schemas.openxmlformats.org/spreadsheetml/2006/main',
+                 x14ac            TYPE string VALUE 'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac',
+                 vba_project      TYPE string VALUE 'http://schemas.microsoft.com/office/2006/relationships/vbaProject', "#EC NEEDED     for future incorporation of XLSM-reader
+                 c                TYPE string VALUE 'http://schemas.openxmlformats.org/drawingml/2006/chart',
+                 a                TYPE string VALUE 'http://schemas.openxmlformats.org/drawingml/2006/main',
+                 xdr              TYPE string VALUE 'http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing',
+                 mc               TYPE string VALUE 'http://schemas.openxmlformats.org/markup-compatibility/2006',
+                 r                TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships',
+                 chart            TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart',
+                 drawing          TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing',
+                 hyperlink        TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink',
+                 image            TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
+                 office_document  TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument',
+                 printer_settings TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings',
+                 shared_strings   TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings',
+                 styles           TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles',
+                 theme            TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme',
+                 worksheet        TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet',
+                 relationships    TYPE string VALUE 'http://schemas.openxmlformats.org/package/2006/relationships',
+                 core_properties  TYPE string VALUE 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties',
+                 main             TYPE string VALUE 'http://schemas.openxmlformats.org/spreadsheetml/2006/main',
                END OF namespace.
 
   PRIVATE SECTION.
@@ -4165,7 +4165,7 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION.
 *--------------------------------------------------------------------*
 * §3  Cycle through the Relationship Tags and use the ones we need
 *--------------------------------------------------------------------*
-    lo_node ?= lo_rels->find_from_name_ns( name = 'Relationship' uri = namespace-relationships ).   "#EC NOTEXT
+    lo_node ?= lo_rels->find_from_name_ns( name = 'Relationship' uri = namespace-relationships ). "#EC NOTEXT
     WHILE lo_node IS BOUND.
 
       fill_struct_from_attributes( EXPORTING
diff --git a/src/zcl_excel_theme.clas.abap b/src/zcl_excel_theme.clas.abap
index 278fa03..75c3323 100644
--- a/src/zcl_excel_theme.clas.abap
+++ b/src/zcl_excel_theme.clas.abap
@@ -30,12 +30,12 @@ CLASS zcl_excel_theme DEFINITION
         VALUE(iv_syscolorlast) TYPE zcl_excel_theme_color_scheme=>t_srgb OPTIONAL .
     METHODS set_color_scheme_name
       IMPORTING
-        VALUE(iv_name) TYPE string .
+        iv_name TYPE string .
     METHODS set_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 set_latin_font
       IMPORTING
         VALUE(iv_type)        TYPE string
diff --git a/src/zcl_excel_theme_color_scheme.clas.abap b/src/zcl_excel_theme_color_scheme.clas.abap
index ade6ee9..c5b2222 100644
--- a/src/zcl_excel_theme_color_scheme.clas.abap
+++ b/src/zcl_excel_theme_color_scheme.clas.abap
@@ -44,10 +44,10 @@ CLASS zcl_excel_theme_color_scheme DEFINITION
         !io_color_scheme TYPE REF TO if_ixml_element .
     METHODS set_color
       IMPORTING
-        VALUE(iv_type)         TYPE string
-        VALUE(iv_srgb)         TYPE t_srgb OPTIONAL
-        VALUE(iv_syscolorname) TYPE string OPTIONAL
-        VALUE(iv_syscolorlast) TYPE t_srgb .
+        iv_type         TYPE string
+        iv_srgb         TYPE t_srgb OPTIONAL
+        iv_syscolorname TYPE string OPTIONAL
+        iv_syscolorlast TYPE t_srgb .
     METHODS build_xml
       IMPORTING
         !io_document TYPE REF TO if_ixml_document .
diff --git a/src/zcl_excel_theme_font_scheme.clas.abap b/src/zcl_excel_theme_font_scheme.clas.abap
index 4b939d3..15313d8 100644
--- a/src/zcl_excel_theme_font_scheme.clas.abap
+++ b/src/zcl_excel_theme_font_scheme.clas.abap
@@ -52,7 +52,7 @@ CLASS zcl_excel_theme_font_scheme DEFINITION
         !io_font_scheme TYPE REF TO if_ixml_element .
     METHODS set_name
       IMPORTING
-        VALUE(iv_name) TYPE string .
+        iv_name TYPE string .
     METHODS build_xml
       IMPORTING
         !io_document TYPE REF TO if_ixml_document .