diff --git a/ZA2X/PROG/ZDEMO_EXCEL1.slnk b/ZA2X/PROG/ZDEMO_EXCEL1.slnk
index 8bdf304..397dc96 100644
--- a/ZA2X/PROG/ZDEMO_EXCEL1.slnk
+++ b/ZA2X/PROG/ZDEMO_EXCEL1.slnk
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-16"?>
-<PROG NAME="ZDEMO_EXCEL1" VARCL="X" SUBC="1" CNAM="FEMIA" CDAT="20100711" UNAM="BCUSER" UDAT="20101228" VERN="000054" RSTAT="T" RMAND="001" RLOAD="E" FIXPT="X" SDATE="20101228" STIME="105109" IDATE="20101228" ITIME="105109" UCCHECK="X">
+<PROG NAME="ZDEMO_EXCEL1" VARCL="X" SUBC="1" CNAM="FEMIA" CDAT="20100711" UNAM="BCUSER" UDAT="20110119" VERN="000056" RSTAT="T" RMAND="001" RLOAD="E" FIXPT="X" SDATE="20110119" STIME="192131" IDATE="20110119" ITIME="192131" UCCHECK="X">
  <textPool>
   <language SPRAS="E">
    <textElement ID="R" ENTRY="abap2xlsx Demo: Hello World" LENGTH="27 "/>
@@ -66,8 +66,8 @@ START-OF-SELECTION.
   lo_hyperlink = zcl_excel_hyperlink=&gt;create_external_link( iv_url = &apos;https://cw.sdn.sap.com/cw/groups/abap2xlsx&apos; ).
   lo_worksheet-&gt;set_cell( ip_column = &apos;B&apos; ip_row = 4 ip_value = &apos;Click here to visit abap2xlsx homepage&apos; ip_hyperlink = lo_hyperlink ).
 
-  column_dimension = lo_worksheet-&gt;get_column_dimension( &apos;B&apos; ).
-  column_dimension-&gt;set_width( 11 ).
+  column_dimension = lo_worksheet-&gt;get_column_dimension( ip_column = &apos;B&apos; ).
+  column_dimension-&gt;set_width( ip_width = 11 ).
 
   CREATE OBJECT lo_excel_writer TYPE zcl_excel_writer_2007.
   lv_file = lo_excel_writer-&gt;write_file( lo_excel ).
diff --git a/ZA2X/PROG/ZDEMO_EXCEL12.slnk b/ZA2X/PROG/ZDEMO_EXCEL12.slnk
index 7ac5cdb..267784d 100644
--- a/ZA2X/PROG/ZDEMO_EXCEL12.slnk
+++ b/ZA2X/PROG/ZDEMO_EXCEL12.slnk
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-16"?>
-<PROG NAME="ZDEMO_EXCEL12" VARCL="X" SUBC="1" CNAM="BCUSER" CDAT="20100811" UNAM="BCUSER" UDAT="20101228" VERN="000036" RSTAT="T" RMAND="000" RLOAD="E" FIXPT="X" SDATE="20101228" STIME="110507" IDATE="20101228" ITIME="110507" UCCHECK="X">
+<PROG NAME="ZDEMO_EXCEL12" VARCL="X" SUBC="1" CNAM="BCUSER" CDAT="20100811" UNAM="BCUSER" UDAT="20110119" VERN="000038" RSTAT="T" RMAND="000" RLOAD="E" FIXPT="X" SDATE="20110119" STIME="192846" IDATE="20110119" ITIME="192846" UCCHECK="X">
  <textPool>
   <language SPRAS="E">
    <textElement ID="R" ENTRY="abap2xlsx Demo: Hide Columns" LENGTH="28 "/>
@@ -77,37 +77,37 @@ START-OF-SELECTION.
 
   &quot; Column Settings
   &quot; Auto size
-  column_dimension = lo_worksheet-&gt;get_column_dimension( &apos;B&apos; ).
-  column_dimension-&gt;set_auto_size( abap_true ).
-  column_dimension = lo_worksheet-&gt;get_column_dimension( &apos;I&apos; ).
-  column_dimension-&gt;set_auto_size( abap_true ).
+  column_dimension = lo_worksheet-&gt;get_column_dimension( ip_column = &apos;B&apos; ).
+  column_dimension-&gt;set_auto_size( ip_auto_size = abap_true ).
+  column_dimension = lo_worksheet-&gt;get_column_dimension( ip_column = &apos;I&apos; ).
+  column_dimension-&gt;set_auto_size( ip_auto_size = abap_true ).
   &quot; Manual Width
-  column_dimension = lo_worksheet-&gt;get_column_dimension( &apos;C&apos; ).
-  column_dimension-&gt;set_width( 50 ).
-  column_dimension = lo_worksheet-&gt;get_column_dimension( &apos;D&apos; ).
+  column_dimension = lo_worksheet-&gt;get_column_dimension( ip_column = &apos;C&apos; ).
+  column_dimension-&gt;set_width( ip_width = 50 ).
+  column_dimension = lo_worksheet-&gt;get_column_dimension( ip_column = &apos;D&apos; ).
   column_dimension-&gt;set_visible( ip_visible = abap_false ).
   &quot; Implementation in the Writer is not working yet ===== TODO =====
-  column_dimension = lo_worksheet-&gt;get_column_dimension( &apos;F&apos; ).
-  column_dimension-&gt;set_outline_level( 0 ).
-  column_dimension = lo_worksheet-&gt;get_column_dimension( &apos;G&apos; ).
-  column_dimension-&gt;set_outline_level( 1 ).
-  column_dimension = lo_worksheet-&gt;get_column_dimension( &apos;H&apos; ).
-  column_dimension-&gt;set_outline_level( 2 ).
+  column_dimension = lo_worksheet-&gt;get_column_dimension( ip_column = &apos;F&apos; ).
+  column_dimension-&gt;set_outline_level( ip_outline_level = 0 ).
+  column_dimension = lo_worksheet-&gt;get_column_dimension( ip_column = &apos;G&apos; ).
+  column_dimension-&gt;set_outline_level( ip_outline_level = 1 ).
+  column_dimension = lo_worksheet-&gt;get_column_dimension( ip_column = &apos;H&apos; ).
+  column_dimension-&gt;set_outline_level( ip_outline_level = 2 ).
 
-  row_dimension = lo_worksheet-&gt;get_row_dimension( 1 ).
-  row_dimension-&gt;set_visible( abap_false ).
-  row_dimension = lo_worksheet-&gt;get_row_dimension( 5 ).
-  row_dimension-&gt;set_row_height( 20 ).
+  row_dimension = lo_worksheet-&gt;get_row_dimension( ip_row = 1 ).
+  row_dimension-&gt;set_visible( ip_visible = abap_false ).
+  row_dimension = lo_worksheet-&gt;get_row_dimension( ip_row = 5 ).
+  row_dimension-&gt;set_row_height( ip_row_height = 20 ).
   &quot; Implementation in the Writer is not working yet ===== TODO =====
-  row_dimension = lo_worksheet-&gt;get_row_dimension( 6 ).
-  row_dimension-&gt;set_outline_level( 0 ).
-  row_dimension = lo_worksheet-&gt;get_row_dimension( 7 ).
-  row_dimension-&gt;set_outline_level( 1 ).
-  row_dimension = lo_worksheet-&gt;get_row_dimension( 8 ).
-  row_dimension-&gt;set_outline_level( 2 ).
+  row_dimension = lo_worksheet-&gt;get_row_dimension( ip_row = 6 ).
+  row_dimension-&gt;set_outline_level( ip_outline_level = 0 ).
+  row_dimension = lo_worksheet-&gt;get_row_dimension( ip_row = 7 ).
+  row_dimension-&gt;set_outline_level( ip_outline_level = 1 ).
+  row_dimension = lo_worksheet-&gt;get_row_dimension( ip_row = 8 ).
+  row_dimension-&gt;set_outline_level( ip_outline_level = 2 ).
 
   CREATE OBJECT lo_excel_writer TYPE zcl_excel_writer_2007.
-  lv_file = lo_excel_writer-&gt;write_file( lo_excel ).
+  lv_file = lo_excel_writer-&gt;write_file( io_excel = lo_excel ).
 
   &quot; Convert to binary
   CALL FUNCTION &apos;SCMS_XSTRING_TO_BINARY&apos;
diff --git a/ZA2X/PROG/ZDEMO_EXCEL20.slnk b/ZA2X/PROG/ZDEMO_EXCEL20.slnk
index 59908f5..3f03306 100644
--- a/ZA2X/PROG/ZDEMO_EXCEL20.slnk
+++ b/ZA2X/PROG/ZDEMO_EXCEL20.slnk
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-16"?>
-<PROG NAME="ZDEMO_EXCEL20" VARCL="X" SUBC="1" CNAM="HUNGHM" CDAT="20101117" UNAM="BCUSER" UDAT="20101228" VERN="000038" RMAND="800" RLOAD="E" FIXPT="X" SDATE="20101228" STIME="110629" IDATE="20101228" ITIME="110629" UCCHECK="X">
+<PROG NAME="ZDEMO_EXCEL20" VARCL="X" SUBC="1" CNAM="HUNGHM" CDAT="20101117" UNAM="BCUSER" UDAT="20110119" VERN="000040" RMAND="800" RLOAD="E" FIXPT="X" SDATE="20110119" STIME="193103" IDATE="20110119" ITIME="193103" UCCHECK="X">
  <textPool>
   <language SPRAS="E">
    <textElement ID="R" ENTRY="abap2xlsx Demo: Bind ALV" LENGTH="24 "/>
@@ -849,11 +849,11 @@ START-OF-SELECTION.
   ENDTRY.
 
   TRY.
-      CALL METHOD lo_salv-&gt;set_screen_status
+      lo_salv-&gt;set_screen_status(
         EXPORTING
           report        = sy-repid
           pfstatus      = &apos;ALV_STATUS&apos;
-          set_functions = lo_salv-&gt;c_functions_all.
+          set_functions = lo_salv-&gt;c_functions_all ).
     CATCH cx_salv_msg .
   ENDTRY.
 
@@ -933,7 +933,7 @@ FORM export_to_excel.
 
 * write to excel using method Bin_ALV
 
-  CALL METHOD lo_worksheet-&gt;bind_alv
+  lo_worksheet-&gt;bind_alv(
     EXPORTING
 *      I_DOCUMENT_URL          = SPACE &quot; excel template
 *      I_XLS                   = &apos;X&apos; &quot; create in xls format?
@@ -956,7 +956,7 @@ FORM export_to_excel.
       dim_mismatch_sema       = 6
       error_in_sema           = 7
       OTHERS                  = 8
-          .
+          ).
   IF sy-subrc &lt;&gt; 0.
     MESSAGE ID sy-msgid TYPE sy-msgty NUMBER sy-msgno
                WITH sy-msgv1 sy-msgv2 sy-msgv3 sy-msgv4.
diff --git a/ZA2X/PROG/ZDEMO_EXCEL23.slnk b/ZA2X/PROG/ZDEMO_EXCEL23.slnk
index 9073785..ad37f96 100644
--- a/ZA2X/PROG/ZDEMO_EXCEL23.slnk
+++ b/ZA2X/PROG/ZDEMO_EXCEL23.slnk
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-16"?>
-<PROG NAME="ZDEMO_EXCEL23" VARCL="X" SUBC="1" CNAM="BCUSER" CDAT="20110116" UNAM="BCUSER" UDAT="20110116" VERN="000021" RSTAT="T" RMAND="001" RLOAD="E" FIXPT="X" SDATE="20110116" STIME="180328" IDATE="20110116" ITIME="180328" UCCHECK="X">
+<PROG NAME="ZDEMO_EXCEL23" VARCL="X" SUBC="1" CNAM="BCUSER" CDAT="20110116" UNAM="BCUSER" UDAT="20110119" VERN="000022" RSTAT="T" RMAND="001" RLOAD="E" FIXPT="X" SDATE="20110119" STIME="193230" IDATE="20110119" ITIME="193230" UCCHECK="X">
  <textPool>
   <language SPRAS="E">
    <textElement ID="R" ENTRY="abap2xlsx Demo: Multiple sheets with and w/o grid lines, print options" LENGTH="70 "/>
@@ -94,7 +94,7 @@ START-OF-SELECTION.
 
 
   CREATE OBJECT lo_excel_writer TYPE zcl_excel_writer_2007.
-  lv_file = lo_excel_writer-&gt;write_file( lo_excel ).
+  lv_file = lo_excel_writer-&gt;write_file( io_excel = lo_excel ).
 
   &quot; Convert to binary
   CALL FUNCTION &apos;SCMS_XSTRING_TO_BINARY&apos;
diff --git a/ZA2X/PROG/ZDEMO_EXCEL3.slnk b/ZA2X/PROG/ZDEMO_EXCEL3.slnk
index 0e67505..39ce402 100644
--- a/ZA2X/PROG/ZDEMO_EXCEL3.slnk
+++ b/ZA2X/PROG/ZDEMO_EXCEL3.slnk
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-16"?>
-<PROG NAME="ZDEMO_EXCEL3" VARCL="X" SUBC="1" CNAM="FEMIA" CDAT="20100711" UNAM="BCUSER" UDAT="20101228" VERN="000034" RSTAT="T" RMAND="001" RLOAD="E" FIXPT="X" SDATE="20101228" STIME="110258" IDATE="20101228" ITIME="110258" UCCHECK="X">
+<PROG NAME="ZDEMO_EXCEL3" VARCL="X" SUBC="1" CNAM="FEMIA" CDAT="20100711" UNAM="BCUSER" UDAT="20110119" VERN="000036" RSTAT="T" RMAND="001" RLOAD="E" FIXPT="X" SDATE="20110119" STIME="192508" IDATE="20110119" ITIME="192508" UCCHECK="X">
  <textPool>
   <language SPRAS="E">
    <textElement ID="R" ENTRY="abap2xlsx Demo: Export internal table" LENGTH="37 "/>
@@ -80,8 +80,8 @@ START-OF-SELECTION.
 
   lo_worksheet-&gt;freeze_panes( ip_num_rows = 3 ). &quot;freeze column headers when scrolling
 
-  column_dimension = lo_worksheet-&gt;get_column_dimension( &apos;E&apos; ). &quot;make date field a bit wider
-  column_dimension-&gt;set_width( 11 ).
+  column_dimension = lo_worksheet-&gt;get_column_dimension( ip_column = &apos;E&apos; ). &quot;make date field a bit wider
+  column_dimension-&gt;set_width( ip_width = 11 ).
 
   CREATE OBJECT lo_excel_writer TYPE zcl_excel_writer_2007.
   lv_file = lo_excel_writer-&gt;write_file( lo_excel ).