diff --git a/src/z2ui5_cl_demo_app_085.clas.abap b/src/z2ui5_cl_demo_app_085.clas.abap
index 43818859..c5ec4335 100644
--- a/src/z2ui5_cl_demo_app_085.clas.abap
+++ b/src/z2ui5_cl_demo_app_085.clas.abap
@@ -61,7 +61,7 @@ CLASS Z2UI5_CL_DEMO_APP_085 DEFINITION
 
     DATA lv_layout TYPE string .
     DATA ls_detail TYPE ty_s_tab .
-    DATA lv_sort_desc TYPE boolean VALUE abap_true.
+    DATA lv_sort_desc TYPE abap_bool VALUE abap_true.
     DATA c_pic_url TYPE string VALUE 'https://sapui5.hana.ondemand.com/sdk/test-resources/sap/ui/documentation/sdk/images/'.
     DATA ls_detail_supplier TYPE ty_s_tab_supplier .
     DATA check_detail_active TYPE abap_bool.
@@ -151,7 +151,7 @@ CLASS Z2UI5_CL_DEMO_APP_085 IMPLEMENTATION.
              press = client->_event( 'ONCLOSEDETAIL' )
          ).
 
-    DATA(header_content) = page->header_Content( ns = 'uxap').
+    DATA(header_content) = page->header_Content( ns = 'uxap' ).
     header_content->flex_box( wrap = 'Wrap'
        )->avatar( src = c_pic_url && ls_detail-pic class = 'sapUiSmallMarginEnd' displaySize = 'layout'
         )->vertical_layout( class = 'sapUiSmallMarginBeginEnd'
@@ -301,7 +301,7 @@ CLASS Z2UI5_CL_DEMO_APP_085 IMPLEMENTATION.
              )->link(
          )->get_parent( ).
 
-    DATA(lr_master) = page->flexible_column_layout( layout = lv_layout id ='Detail' )->begin_column_pages( ).
+    DATA(lr_master) = page->flexible_column_layout( layout = lv_layout id = 'Detail' )->begin_column_pages( ).
 
     DATA(tab) = lr_master->scroll_container( height = '100%' vertical = abap_true
    )->table(
diff --git a/src/z2ui5_cl_demo_app_097.clas.abap b/src/z2ui5_cl_demo_app_097.clas.abap
index 54307a77..c80fb888 100644
--- a/src/z2ui5_cl_demo_app_097.clas.abap
+++ b/src/z2ui5_cl_demo_app_097.clas.abap
@@ -63,7 +63,7 @@ CLASS Z2UI5_CL_DEMO_APP_097 IMPLEMENTATION.
     lo_columns->ui_column(  sortproperty = 'TITLE'
                                           filterproperty = 'TITLE' )->text( text = `Index` )->ui_template( )->text(   text = `{TITLE}` ).
     lo_columns->ui_column(  sortproperty = 'DESCR' filterproperty = 'DESCR' )->text( text = `DESCR` )->ui_template( )->text(   text = `{DESCR}` ).
-    lo_columns->ui_column(  sortproperty = 'INFO' filterproperty = 'INFO')->text( text = `INFO` )->ui_template( )->text( text = `{INFO}` ).
+    lo_columns->ui_column(  sortproperty = 'INFO' filterproperty = 'INFO' )->text( text = `INFO` )->ui_template( )->text( text = `{INFO}` ).
     lo_columns->get_parent( )->ui_row_action_template( )->ui_row_action(
        )->ui_row_action_item( icon = `sap-icon://delete`
                            press = client->_event( val = 'ROW_DELETE' t_arg = VALUE #( ( `${TITLE}`  ) ) ) ).
@@ -91,7 +91,7 @@ CLASS Z2UI5_CL_DEMO_APP_097 IMPLEMENTATION.
              )->link(
          )->get_parent( ).
 
-    DATA(col_layout) =  page->flexible_column_layout( layout = client->_bind_edit( mv_layout ) id ='test' ).
+    DATA(col_layout) =  page->flexible_column_layout( layout = client->_bind_edit( mv_layout ) id = 'test' ).
 
     DATA(lr_master) = col_layout->begin_column_pages( ).