diff --git a/abaplint-app.json b/abaplint-app.json
index da743161..716b99a5 100644
--- a/abaplint-app.json
+++ b/abaplint-app.json
@@ -4,8 +4,7 @@
       "filename": "./abaplint.jsonc"
     },
     "steampunk": {
-      "filename": "./abaplint-steampunk.jsonc",
-      "annotations": false
+      "filename": "./abaplint-steampunk.jsonc"
     }
   }
 }
diff --git a/src/01/01/z2ui5_cl_util_func.clas.abap b/src/01/01/z2ui5_cl_util_func.clas.abap
index 376fe424..20bbe2a7 100644
--- a/src/01/01/z2ui5_cl_util_func.clas.abap
+++ b/src/01/01/z2ui5_cl_util_func.clas.abap
@@ -1229,9 +1229,9 @@ CLASS z2ui5_cl_util_func IMPLEMENTATION.
   METHOD trans_json_2_any.
     TRY.
 
-          z2ui5_cl_ajson=>parse( val )->to_abap(
-            IMPORTING
-              ev_container = data ).
+        z2ui5_cl_ajson=>parse( val )->to_abap(
+          IMPORTING
+            ev_container = data ).
 
       CATCH z2ui5_cx_ajson_error INTO DATA(x).
         ASSERT x IS NOT BOUND.
@@ -1300,9 +1300,8 @@ CLASS z2ui5_cl_util_func IMPLEMENTATION.
 
     ENDIF.
 
-
-
-    CALL METHOD ('ZCL_SRTTI_TYPEDESCR')=>('CREATE_BY_DATA_OBJECT')
+    DATA(lv_classname) = 'ZCL_SRTTI_TYPEDESCR'.
+    CALL METHOD (lv_classname)=>('CREATE_BY_DATA_OBJECT')
       EXPORTING
         data_object = data
       RECEIVING
@@ -1310,8 +1309,6 @@ CLASS z2ui5_cl_util_func IMPLEMENTATION.
 
     CALL TRANSFORMATION id SOURCE srtti = srtti dobj = data RESULT XML result.
 
-
-
   ENDMETHOD.
 
 
@@ -1408,13 +1405,14 @@ CLASS z2ui5_cl_util_func IMPLEMENTATION.
 
 
   METHOD uuid_get_c22.
+
     DATA uuid TYPE c LENGTH 22.
 
     TRY.
 
-
         TRY.
-            CALL METHOD (`CL_SYSTEM_UUID`)=>if_system_uuid_static~create_uuid_c22
+            DATA(lv_classname) = `CL_SYSTEM_UUID`.
+            CALL METHOD (lv_classname)=>if_system_uuid_static~create_uuid_c22
               RECEIVING
                 uuid = uuid.
 
@@ -1458,9 +1456,9 @@ CLASS z2ui5_cl_util_func IMPLEMENTATION.
 
     TRY.
 
-
         TRY.
-            CALL METHOD (`CL_SYSTEM_UUID`)=>if_system_uuid_static~create_uuid_c32
+            data(lv_classname) = `CL_SYSTEM_UUID`.
+            CALL METHOD (lv_classname)=>if_system_uuid_static~create_uuid_c32
               RECEIVING
                 uuid = uuid.
 
diff --git a/src/01/02/z2ui5_cl_fw_controller.clas.abap b/src/01/02/z2ui5_cl_fw_controller.clas.abap
index 6f7a5151..4d63d6c6 100644
--- a/src/01/02/z2ui5_cl_fw_controller.clas.abap
+++ b/src/01/02/z2ui5_cl_fw_controller.clas.abap
@@ -295,7 +295,7 @@ CLASS z2ui5_cl_fw_controller IMPLEMENTATION.
   METHOD body_read_location.
     TRY.
 
-        so_body_ajson->slice( `/OLOCATION`  )->to_abap(
+        so_body_ajson->slice( `/OLOCATION` )->to_abap(
             IMPORTING
             ev_container     = ss_config
         ).
@@ -361,12 +361,12 @@ CLASS z2ui5_cl_fw_controller IMPLEMENTATION.
           result->ms_actual-check_on_navigated = abap_false.
         ENDIF.
 
-        result->ms_db-check_attri = abap_false.
-
         IF ss_config-search CS `scenario=LAUNCHPAD`.
           result->ms_actual-check_launchpad_active = abap_true.
         ENDIF.
 
+        result->ms_db-check_attri = abap_false.
+
       CATCH cx_root INTO DATA(x).
         ASSERT x IS NOT BOUND.
     ENDTRY.
diff --git a/src/02/03/z2ui5_cl_popup_itab_json_dl.clas.abap b/src/02/03/z2ui5_cl_popup_itab_json_dl.clas.abap
index f424fa36..fd9923cb 100644
--- a/src/02/03/z2ui5_cl_popup_itab_json_dl.clas.abap
+++ b/src/02/03/z2ui5_cl_popup_itab_json_dl.clas.abap
@@ -39,7 +39,7 @@ ENDCLASS.
 
 
 
-CLASS Z2UI5_CL_POPUP_ITAB_JSON_DL IMPLEMENTATION.
+CLASS z2ui5_cl_popup_itab_json_dl IMPLEMENTATION.
 
 
   METHOD factory.
@@ -81,8 +81,8 @@ CLASS Z2UI5_CL_POPUP_ITAB_JSON_DL IMPLEMENTATION.
 
         ELSE.
 
-
-          CALL METHOD ('Z2UI5_DBT_CL_APP_03')=>('FACTORY_POPUP_BY_ITAB')
+          DATA(lv_classname) = `Z2UI5_DBT_CL_APP_03`.
+          CALL METHOD (lv_classname)=>('FACTORY_POPUP_BY_ITAB')
             EXPORTING
               itab   = mr_itab
             RECEIVING