diff --git a/src/z2ui5_cl_demo_app_093.clas.abap b/src/z2ui5_cl_demo_app_093.clas.abap
index cc2b5dbe..f2709708 100644
--- a/src/z2ui5_cl_demo_app_093.clas.abap
+++ b/src/z2ui5_cl_demo_app_093.clas.abap
@@ -28,7 +28,7 @@ CLASS Z2UI5_CL_DEMO_APP_093 IMPLEMENTATION.
       DATA(view) = z2ui5_cl_xml_view=>factory( ).
 
       view->_generic( ns   = `html`
-                      name = `script`)->_cc_plain_xml( `sap.z2ui5.myFunction();`).
+                      name = `script`)->_cc_plain_xml( `sap.z2ui5.myFunction();` ).
 
       client->view_display( view->shell(
             )->page(
diff --git a/src/z2ui5_cl_demo_app_100.clas.abap b/src/z2ui5_cl_demo_app_100.clas.abap
index ad7f28b8..6a091dee 100644
--- a/src/z2ui5_cl_demo_app_100.clas.abap
+++ b/src/z2ui5_cl_demo_app_100.clas.abap
@@ -142,16 +142,16 @@ CLASS Z2UI5_CL_DEMO_APP_100 IMPLEMENTATION.
                            filterproperty = 'CREATE_DATE' )->text( text = `Date` )->ui_template( )->text( text = `{CREATE_DATE}` ).
     lo_columns->ui_column( width          = '11rem'
                            sortproperty   = 'CREATE_BY'
-                           filterproperty = 'CREATE_BY')->text( text = `Name` )->ui_template( )->text( text = `{CREATE_BY}` ).
+                           filterproperty = 'CREATE_BY' )->text( text = `Name` )->ui_template( )->text( text = `{CREATE_BY}` ).
     lo_columns->ui_column( width          = '11rem'
                            sortproperty   = 'STORAGE_LOCATION'
-                           filterproperty = 'STORAGE_LOCATION' )->text( text = `Location` )->ui_template( )->text( text = `{STORAGE_LOCATION}`).
+                           filterproperty = 'STORAGE_LOCATION' )->text( text = `Location` )->ui_template( )->text( text = `{STORAGE_LOCATION}` ).
     lo_columns->ui_column( width          = '11rem'
                            sortproperty   = 'QUANTITY'
-                           filterproperty = 'QUANTITY' )->text( text = `Quantity` )->ui_template( )->text( text = `{QUANTITY}`).
+                           filterproperty = 'QUANTITY' )->text( text = `Quantity` )->ui_template( )->text( text = `{QUANTITY}` ).
     lo_columns->ui_column( width          = '6rem'
                            sortproperty   = 'MEINS'
-                           filterproperty = 'MEINS' )->text( text = `Unit` )->ui_template( )->text( text = `{MEINS}`).
+                           filterproperty = 'MEINS' )->text( text = `Unit` )->ui_template( )->text( text = `{MEINS}` ).
     lo_columns->ui_column( width          = '11rem'
                            sortproperty   = 'PRICE'
                            filterproperty = 'PRICE' )->text( text = `Price` )->ui_template( )->currency( value    = `{PRICE}`
diff --git a/src/z2ui5_cl_demo_app_121.clas.abap b/src/z2ui5_cl_demo_app_121.clas.abap
index b8ed3447..de113fb8 100644
--- a/src/z2ui5_cl_demo_app_121.clas.abap
+++ b/src/z2ui5_cl_demo_app_121.clas.abap
@@ -20,7 +20,8 @@ ENDCLASS.
 
 
 
-CLASS z2ui5_cl_demo_app_121 IMPLEMENTATION.
+CLASS Z2UI5_CL_DEMO_APP_121 IMPLEMENTATION.
+
 
   METHOD z2ui5_if_app~main.
 
@@ -42,7 +43,7 @@ CLASS z2ui5_cl_demo_app_121 IMPLEMENTATION.
     CASE client->get( )-event.
 
       WHEN 'TIMER_FINISHED'.
-        client->message_box_display( `Timer finished!`).
+        client->message_box_display( `Timer finished!` ).
         RETURN.
 
       WHEN 'BACK'.
diff --git a/src/z2ui5_cl_demo_app_191.clas.abap b/src/z2ui5_cl_demo_app_191.clas.abap
index f358a886..07638ab4 100644
--- a/src/z2ui5_cl_demo_app_191.clas.abap
+++ b/src/z2ui5_cl_demo_app_191.clas.abap
@@ -62,10 +62,10 @@ CLASS Z2UI5_CL_DEMO_APP_191 IMPLEMENTATION.
 
   METHOD on_init.
 
-    mt_t002 = VALUE #( ( id = '1' class = 'Z2UI5_CL_DEMO_APP_190'  count = '10' table = 'Z2UI5_T001')
-                       ( id = '2' class = 'Z2UI5_CL_DEMO_APP_190'  count = '20' table = 'Z2UI5_T002')
-                       ( id = '3' class = 'Z2UI5_CL_DEMO_APP_190'  count = '30' table = 'Z2UI5_TOOL_T_001')
-                       ( id = '4' class = 'Z2UI5_CL_DEMO_APP_190'  count = '40' table = 'Z2UI5_TOOL_T_002') ).
+    mt_t002 = VALUE #( ( id = '1' class = 'Z2UI5_CL_DEMO_APP_190'  count = '10' table = 'Z2UI5_T001' )
+                       ( id = '2' class = 'Z2UI5_CL_DEMO_APP_190'  count = '20' table = 'Z2UI5_T002' )
+                       ( id = '3' class = 'Z2UI5_CL_DEMO_APP_190'  count = '30' table = 'Z2UI5_TOOL_T_001' )
+                       ( id = '4' class = 'Z2UI5_CL_DEMO_APP_190'  count = '40' table = 'Z2UI5_TOOL_T_002' ) ).
 
     mv_selectedkey = '1'.