diff --git a/src/git/zcl_abapgit_git_branch_list.clas.abap b/src/git/zcl_abapgit_git_branch_list.clas.abap
index c3e05cfa3..636ce1729 100644
--- a/src/git/zcl_abapgit_git_branch_list.clas.abap
+++ b/src/git/zcl_abapgit_git_branch_list.clas.abap
@@ -98,7 +98,7 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
     ELSE.
       rv_name = 'refs/heads/' && iv_branch_name.
     ENDIF.
-  ENDMETHOD.  "complete_heads_branch_name
+  ENDMETHOD.
 
 
   METHOD constructor.
@@ -106,7 +106,7 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
       EXPORTING iv_data        = iv_data
       IMPORTING et_list        = me->mt_branches
                 ev_head_symref = me->mv_head_symref ).
-  ENDMETHOD.  "create
+  ENDMETHOD.
 
 
   METHOD find_by_name.
@@ -127,7 +127,7 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
 
     ENDIF.
 
-  ENDMETHOD.  "find_by_name
+  ENDMETHOD.
 
 
   METHOD get_branches_only.
@@ -138,7 +138,7 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
         APPEND <ls_branch> TO rt_branches.
       ENDIF.
     ENDLOOP.
-  ENDMETHOD.  "get_branches_only
+  ENDMETHOD.
 
 
   METHOD get_display_name.
@@ -150,7 +150,7 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
       REPLACE FIRST OCCURRENCE OF 'refs/' IN rv_display_name WITH ''.
     ENDIF.
 
-  ENDMETHOD.  "get_display_name
+  ENDMETHOD.
 
 
   METHOD get_head.
@@ -161,12 +161,12 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
       rs_branch = find_by_name( zif_abapgit_definitions=>c_head_name ).
     ENDIF.
 
-  ENDMETHOD.  "get_head
+  ENDMETHOD.
 
 
   METHOD get_head_symref.
     rv_head_symref = mv_head_symref.
-  ENDMETHOD.  " get_head_symref.
+  ENDMETHOD.
 
 
   METHOD get_tags_only.
@@ -178,7 +178,7 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
       APPEND <ls_branch> TO rt_tags.
     ENDLOOP.
 
-  ENDMETHOD.  "get_tags_only
+  ENDMETHOD.
 
 
   METHOD get_type.
@@ -208,7 +208,7 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
 
     ENDIF.
 
-  ENDMETHOD.  "get_type
+  ENDMETHOD.
 
 
   METHOD is_ignored.
@@ -224,7 +224,7 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
       rv_ignore = abap_true.
     ENDIF.
 
-  ENDMETHOD.  "is_ignored
+  ENDMETHOD.
 
 
   METHOD normalize_branch_name.
@@ -232,7 +232,7 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
     rv_name = iv_branch_name. " Force convert to string
     REPLACE ALL OCCURRENCES OF ` ` IN rv_name WITH '-'. " Disallow space in branch name
 
-  ENDMETHOD.  " normalize_branch_name.
+  ENDMETHOD.
 
 
   METHOD parse_branch_list.
@@ -288,7 +288,7 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
       ENDIF.
     ENDLOOP.
 
-  ENDMETHOD.                    "parse_branch_list
+  ENDMETHOD.
 
 
   METHOD parse_head_params.
@@ -302,7 +302,7 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
       rv_head_symref = iv_data+ls_submatch-offset(ls_submatch-length).
     ENDIF.
 
-  ENDMETHOD.  "parse_head_params
+  ENDMETHOD.
 
   METHOD find_tag_by_name.
 
diff --git a/src/git/zcl_abapgit_git_pack.clas.abap b/src/git/zcl_abapgit_git_pack.clas.abap
index b6b187b4c..c9fb94017 100644
--- a/src/git/zcl_abapgit_git_pack.clas.abap
+++ b/src/git/zcl_abapgit_git_pack.clas.abap
@@ -275,7 +275,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION.
 
     decode_deltas( CHANGING ct_objects = rt_objects ).
 
-  ENDMETHOD.                    "decode
+  ENDMETHOD.
 
 
   METHOD decode_commit.
@@ -325,7 +325,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION.
       zcx_abapgit_exception=>raise( 'multiple parents? not supported' ).
     ENDIF.
 
-  ENDMETHOD.                    "decode_commit
+  ENDMETHOD.
 
 
   METHOD decode_deltas.
@@ -352,7 +352,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION.
              CHANGING ct_objects = ct_objects ).
     ENDLOOP.
 
-  ENDMETHOD.                    "decode_deltas
+  ENDMETHOD.
 
 
   METHOD decode_tag.
@@ -463,7 +463,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION.
       lv_cursor = lv_match + 1 + lc_sha_length.
     ENDDO.
 
-  ENDMETHOD.                    "decode_tree
+  ENDMETHOD.
 
 
   METHOD delta.
@@ -574,7 +574,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION.
     ls_object-data = lv_result.
     APPEND ls_object TO ct_objects.
 
-  ENDMETHOD.                    "delta
+  ENDMETHOD.
 
 
   METHOD delta_header.
@@ -596,7 +596,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION.
     ENDDO.
     ev_header = zcl_abapgit_convert=>bitbyte_to_int( lv_bits ).
 
-  ENDMETHOD.                    "delta_header
+  ENDMETHOD.
 
 
   METHOD encode.
@@ -656,7 +656,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION.
     lv_sha1 = to_upper( zcl_abapgit_hash=>sha1_raw( rv_data ) ).
     CONCATENATE rv_data lv_sha1 INTO rv_data IN BYTE MODE.
 
-  ENDMETHOD.                    "encode
+  ENDMETHOD.
 
 
   METHOD encode_commit.
@@ -705,7 +705,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION.
 
     rv_data = zcl_abapgit_convert=>string_to_xstring_utf8( lv_string ).
 
-  ENDMETHOD.                    "encode_commit
+  ENDMETHOD.
 
 
   METHOD encode_tag.
@@ -755,7 +755,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION.
       CONCATENATE rv_data lv_xstring lc_null lv_hex20 INTO rv_data IN BYTE MODE.
     ENDLOOP.
 
-  ENDMETHOD.                    "encode_tree
+  ENDMETHOD.
 
 
   METHOD get_length.
@@ -780,7 +780,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION.
 
     ev_length = zcl_abapgit_convert=>bitbyte_to_int( lv_length_bits ).
 
-  ENDMETHOD.                    "get_length
+  ENDMETHOD.
 
 
   METHOD get_type.
@@ -805,7 +805,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION.
         zcx_abapgit_exception=>raise( 'Todo, unknown type' ).
     ENDCASE.
 
-  ENDMETHOD.                    "get_type
+  ENDMETHOD.
 
 
   METHOD sort_tree.
@@ -910,7 +910,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION.
       zcx_abapgit_exception=>raise( 'Todo, encoding length' ).
     ENDIF.
 
-  ENDMETHOD.                    "type_and_length
+  ENDMETHOD.
 
 
   METHOD zlib_decompress.
diff --git a/src/git/zcl_abapgit_git_pack.clas.testclasses.abap b/src/git/zcl_abapgit_git_pack.clas.testclasses.abap
index 41c9861d4..3b8d8ec36 100644
--- a/src/git/zcl_abapgit_git_pack.clas.testclasses.abap
+++ b/src/git/zcl_abapgit_git_pack.clas.testclasses.abap
@@ -188,7 +188,7 @@ CLASS ltcl_pack DEFINITION FOR TESTING DURATION SHORT RISK LEVEL HARMLESS FINAL.
         RETURNING VALUE(rs_object) TYPE zif_abapgit_definitions=>ty_object
         RAISING   zcx_abapgit_exception.
 
-ENDCLASS.       "ltcl_Pack
+ENDCLASS.
 
 
 CLASS ltcl_pack IMPLEMENTATION.
@@ -310,7 +310,7 @@ CLASS ltcl_pack IMPLEMENTATION.
         exp = lt_objects
         act = lt_result ).
 
-  ENDMETHOD.                    "encode_decode_pack_multiple
+  ENDMETHOD.
 
   METHOD object_blob.
 
@@ -320,7 +320,7 @@ CLASS ltcl_pack IMPLEMENTATION.
     rs_object-data = iv_data.
     rs_object-adler32 = zcl_abapgit_hash=>adler32( iv_data ).
 
-  ENDMETHOD.                    "object_blob
+  ENDMETHOD.
 
   METHOD pack_short.
 
@@ -345,7 +345,7 @@ CLASS ltcl_pack IMPLEMENTATION.
         exp = lt_objects
         act = lt_result ).
 
-  ENDMETHOD.                    "encode_decode_pack
+  ENDMETHOD.
 
   METHOD pack_long.
 
@@ -396,7 +396,7 @@ CLASS ltcl_pack IMPLEMENTATION.
         exp = ls_commit
         act = ls_result ).
 
-  ENDMETHOD.                    "commit
+  ENDMETHOD.
 
   METHOD commit_newline.
 
diff --git a/src/git/zcl_abapgit_git_porcelain.clas.abap b/src/git/zcl_abapgit_git_porcelain.clas.abap
index dcd35474e..0ce5edc52 100644
--- a/src/git/zcl_abapgit_git_porcelain.clas.abap
+++ b/src/git/zcl_abapgit_git_porcelain.clas.abap
@@ -340,7 +340,7 @@ CLASS zcl_abapgit_git_porcelain IMPLEMENTATION.
                              iv_tree    = ls_commit-tree
                              iv_base    = '/' ).
 
-  ENDMETHOD.                    "root_tree
+  ENDMETHOD.
 
 
   METHOD pull.
@@ -374,7 +374,7 @@ CLASS zcl_abapgit_git_porcelain IMPLEMENTATION.
                     iv_path = '/'
           CHANGING ct_files = et_files ).
 
-  ENDMETHOD.                    "pull
+  ENDMETHOD.
 
 
   METHOD push.
@@ -466,7 +466,7 @@ CLASS zcl_abapgit_git_porcelain IMPLEMENTATION.
                                    it_blobs   = lt_blobs
                                    io_stage   = io_stage ).
 
-  ENDMETHOD.                    "push
+  ENDMETHOD.
 
 
   METHOD receive_pack_create_tag.
@@ -611,7 +611,7 @@ CLASS zcl_abapgit_git_porcelain IMPLEMENTATION.
           CHANGING ct_files = lt_files ).
     io_repo->set_files_remote( lt_files ).
 
-  ENDMETHOD.                    "receive_pack
+  ENDMETHOD.
 
 
   METHOD walk.
@@ -657,7 +657,7 @@ CLASS zcl_abapgit_git_porcelain IMPLEMENTATION.
             CHANGING ct_files = ct_files ).
     ENDLOOP.
 
-  ENDMETHOD.                    "walk
+  ENDMETHOD.
 
 
   METHOD walk_tree.
diff --git a/src/git/zcl_abapgit_git_transport.clas.abap b/src/git/zcl_abapgit_git_transport.clas.abap
index 048b01c5e..1771fdb38 100644
--- a/src/git/zcl_abapgit_git_transport.clas.abap
+++ b/src/git/zcl_abapgit_git_transport.clas.abap
@@ -77,7 +77,7 @@ CLASS zcl_abapgit_git_transport IMPLEMENTATION.
 
     lo_client->close( ).
 
-  ENDMETHOD.                    "branches
+  ENDMETHOD.
 
 
   METHOD branch_list.
@@ -95,7 +95,7 @@ CLASS zcl_abapgit_git_transport IMPLEMENTATION.
       EXPORTING
         iv_data = lv_data.
 
-  ENDMETHOD.                    "branch_list
+  ENDMETHOD.
 
 
   METHOD find_branch.
@@ -112,7 +112,7 @@ CLASS zcl_abapgit_git_transport IMPLEMENTATION.
       ev_branch = eo_branch_list->find_by_name( iv_branch_name )-sha1.
     ENDIF.
 
-  ENDMETHOD.                    "find_branch
+  ENDMETHOD.
 
 
   METHOD parse.
@@ -149,7 +149,7 @@ CLASS zcl_abapgit_git_transport IMPLEMENTATION.
 
     ev_pack = lv_pack.
 
-  ENDMETHOD.                    "parse
+  ENDMETHOD.
 
 
   METHOD receive_pack.
@@ -213,7 +213,7 @@ CLASS zcl_abapgit_git_transport IMPLEMENTATION.
       zcx_abapgit_exception=>raise( 'missing necessary objects' ).
     ENDIF.
 
-  ENDMETHOD.                    "receive_pack
+  ENDMETHOD.
 
 
   METHOD upload_pack.
@@ -286,5 +286,5 @@ CLASS zcl_abapgit_git_transport IMPLEMENTATION.
 
     et_objects = zcl_abapgit_git_pack=>decode( lv_pack ).
 
-  ENDMETHOD.                    "upload_pack
+  ENDMETHOD.
 ENDCLASS.
diff --git a/src/git/zcl_abapgit_git_utils.clas.abap b/src/git/zcl_abapgit_git_utils.clas.abap
index 2bc7a79db..1895498ff 100644
--- a/src/git/zcl_abapgit_git_utils.clas.abap
+++ b/src/git/zcl_abapgit_git_utils.clas.abap
@@ -36,7 +36,7 @@ CLASS ZCL_ABAPGIT_GIT_UTILS IMPLEMENTATION.
     lv_z = <lv_y>.
     rv_c = lv_z(1).
 
-  ENDMETHOD.                    "get_null
+  ENDMETHOD.
 
 
   METHOD length_utf8_hex.
@@ -69,7 +69,7 @@ CLASS ZCL_ABAPGIT_GIT_UTILS IMPLEMENTATION.
     lv_x = lv_char4.
     rv_len = lv_x.
 
-  ENDMETHOD.                    "length_utf8_hex
+  ENDMETHOD.
 
 
   METHOD pkt_string.
@@ -88,5 +88,5 @@ CLASS ZCL_ABAPGIT_GIT_UTILS IMPLEMENTATION.
 
     rv_pkt = rv_pkt && '00' && lv_x && iv_string.
 
-  ENDMETHOD.                    "pkt_string
+  ENDMETHOD.
 ENDCLASS.