diff --git a/src/syntax/zcl_abapgit_syntax_abap.clas.abap b/src/syntax/zcl_abapgit_syntax_abap.clas.abap
index 3a09436e4..bed91cf49 100644
--- a/src/syntax/zcl_abapgit_syntax_abap.clas.abap
+++ b/src/syntax/zcl_abapgit_syntax_abap.clas.abap
@@ -50,7 +50,7 @@ CLASS ZCL_ABAPGIT_SYNTAX_ABAP IMPLEMENTATION.
 
     init_keywords( ).
 
-  ENDMETHOD.                    " class_constructor
+  ENDMETHOD.
 
 
   METHOD constructor.
@@ -71,7 +71,7 @@ CLASS ZCL_ABAPGIT_SYNTAX_ABAP IMPLEMENTATION.
               iv_token = c_token-text
               iv_style = c_css-text ).
 
-  ENDMETHOD.                    " constructor
+  ENDMETHOD.
 
 
   METHOD init_keywords.
@@ -179,7 +179,7 @@ CLASS ZCL_ABAPGIT_SYNTAX_ABAP IMPLEMENTATION.
     SPLIT lv_keywords AT '|' INTO TABLE lt_keywords.
     gt_keywords = lt_keywords. " Hash table
 
-  ENDMETHOD.                    " init_keywords
+  ENDMETHOD.
 
 
   METHOD is_keyword.
@@ -190,7 +190,7 @@ CLASS ZCL_ABAPGIT_SYNTAX_ABAP IMPLEMENTATION.
     READ TABLE gt_keywords WITH KEY table_line = lv_str TRANSPORTING NO FIELDS.
     rv_yes = boolc( sy-subrc = 0 ).
 
-  ENDMETHOD.  " is_keyword.
+  ENDMETHOD.
 
 
   METHOD order_matches.
@@ -261,7 +261,7 @@ CLASS ZCL_ABAPGIT_SYNTAX_ABAP IMPLEMENTATION.
       ASSIGN <ls_match> TO <ls_prev>.
     ENDLOOP.
 
-  ENDMETHOD.                    " order_matches.
+  ENDMETHOD.
 
 
   METHOD parse_line. "REDEFINITION
diff --git a/src/syntax/zcl_abapgit_syntax_highlighter.clas.abap b/src/syntax/zcl_abapgit_syntax_highlighter.clas.abap
index 64f73c68f..50d55d973 100644
--- a/src/syntax/zcl_abapgit_syntax_highlighter.clas.abap
+++ b/src/syntax/zcl_abapgit_syntax_highlighter.clas.abap
@@ -101,7 +101,7 @@ CLASS ZCL_ABAPGIT_SYNTAX_HIGHLIGHTER IMPLEMENTATION.
       rv_line = lv_escaped.
     ENDIF.
 
-  ENDMETHOD.                    " apply_style
+  ENDMETHOD.
 
 
   METHOD create.
@@ -115,7 +115,7 @@ CLASS ZCL_ABAPGIT_SYNTAX_HIGHLIGHTER IMPLEMENTATION.
       CLEAR ro_instance.
     ENDIF.
 
-  ENDMETHOD.                    " create.
+  ENDMETHOD.
 
 
   METHOD extend_matches.
@@ -152,7 +152,7 @@ CLASS ZCL_ABAPGIT_SYNTAX_HIGHLIGHTER IMPLEMENTATION.
       APPEND ls_match TO ct_matches.
     ENDIF.
 
-  ENDMETHOD.                    " extend_matches
+  ENDMETHOD.
 
 
   METHOD format_line.
@@ -175,7 +175,7 @@ CLASS ZCL_ABAPGIT_SYNTAX_HIGHLIGHTER IMPLEMENTATION.
       rv_line = rv_line && lv_chunk.
     ENDLOOP.
 
-  ENDMETHOD.                    " format_line
+  ENDMETHOD.
 
 
   METHOD parse_line.
@@ -209,7 +209,7 @@ CLASS ZCL_ABAPGIT_SYNTAX_HIGHLIGHTER IMPLEMENTATION.
       ENDLOOP.
     ENDLOOP.
 
-  ENDMETHOD.                    " parse_line
+  ENDMETHOD.
 
 
   METHOD process_line.
@@ -232,5 +232,5 @@ CLASS ZCL_ABAPGIT_SYNTAX_HIGHLIGHTER IMPLEMENTATION.
     rv_line = me->format_line( iv_line    = iv_line
                                it_matches = lt_matches ).
 
-  ENDMETHOD.                    " process_line
+  ENDMETHOD.
 ENDCLASS.
diff --git a/src/syntax/zcl_abapgit_syntax_xml.clas.abap b/src/syntax/zcl_abapgit_syntax_xml.clas.abap
index 4dec77e2a..02c83caee 100644
--- a/src/syntax/zcl_abapgit_syntax_xml.clas.abap
+++ b/src/syntax/zcl_abapgit_syntax_xml.clas.abap
@@ -114,5 +114,5 @@ CLASS zcl_abapgit_syntax_xml IMPLEMENTATION.
       ASSIGN <ls_match> TO <ls_prev>.
     ENDLOOP.
 
-  ENDMETHOD.                    " order_matches
+  ENDMETHOD.
 ENDCLASS.
diff --git a/src/xml/zcl_abapgit_xml.clas.abap b/src/xml/zcl_abapgit_xml.clas.abap
index 023210fd8..f9d7e53e8 100644
--- a/src/xml/zcl_abapgit_xml.clas.abap
+++ b/src/xml/zcl_abapgit_xml.clas.abap
@@ -44,7 +44,7 @@ CLASS ZCL_ABAPGIT_XML IMPLEMENTATION.
   METHOD constructor.
     mi_ixml = cl_ixml=>create( ).
     mi_xml_doc = mi_ixml->create_document( ).
-  ENDMETHOD.                    "constructor
+  ENDMETHOD.
 
 
   METHOD display_xml_error.
@@ -63,7 +63,7 @@ CLASS ZCL_ABAPGIT_XML IMPLEMENTATION.
 
     zcx_abapgit_exception=>raise( 'XML error' ).
 
-  ENDMETHOD.                    "display_xml_error
+  ENDMETHOD.
 
 
   METHOD error.
@@ -98,7 +98,7 @@ CLASS ZCL_ABAPGIT_XML IMPLEMENTATION.
     ENDIF.
 
     zcx_abapgit_exception=>raise( 'Error while parsing XML' ).
-  ENDMETHOD.                    "error
+  ENDMETHOD.
 
 
   METHOD parse.
@@ -136,7 +136,7 @@ CLASS ZCL_ABAPGIT_XML IMPLEMENTATION.
     ms_metadata-class   = li_element->get_attribute_ns( c_attr_serializer ).
     ms_metadata-version = li_element->get_attribute_ns( c_attr_serializer_version ).
 
-  ENDMETHOD.                    "parse
+  ENDMETHOD.
 
 
   METHOD to_xml.
@@ -157,5 +157,5 @@ CLASS ZCL_ABAPGIT_XML IMPLEMENTATION.
 
     li_renderer->render( ).
 
-  ENDMETHOD.                    "to_xml
+  ENDMETHOD.
 ENDCLASS.
diff --git a/src/xml/zcl_abapgit_xml_input.clas.abap b/src/xml/zcl_abapgit_xml_input.clas.abap
index 7a4d59bba..0c59b48df 100644
--- a/src/xml/zcl_abapgit_xml_input.clas.abap
+++ b/src/xml/zcl_abapgit_xml_input.clas.abap
@@ -40,7 +40,7 @@ CLASS ZCL_ABAPGIT_XML_INPUT IMPLEMENTATION.
     parse( iv_xml ).
     fix_xml( ).
 
-  ENDMETHOD.                    "constructor
+  ENDMETHOD.
 
 
   METHOD fix_xml.
@@ -55,17 +55,17 @@ CLASS ZCL_ABAPGIT_XML_INPUT IMPLEMENTATION.
     mi_xml_doc->get_root( )->remove_child( li_git ).
     mi_xml_doc->get_root( )->append_child( li_abap ).
 
-  ENDMETHOD.                    "fix_xml
+  ENDMETHOD.
 
 
   METHOD get_metadata.
     rs_metadata = ms_metadata.
-  ENDMETHOD.                    "get_metadata
+  ENDMETHOD.
 
 
   METHOD get_raw.
     ri_raw = mi_xml_doc.
-  ENDMETHOD.                    "get_raw
+  ENDMETHOD.
 
 
   METHOD read.
@@ -92,5 +92,5 @@ CLASS ZCL_ABAPGIT_XML_INPUT IMPLEMENTATION.
         zcx_abapgit_exception=>raise( lx_error->if_message~get_text( ) ).
     ENDTRY.
 
-  ENDMETHOD.                    "read
+  ENDMETHOD.
 ENDCLASS.
diff --git a/src/xml/zcl_abapgit_xml_input.clas.testclasses.abap b/src/xml/zcl_abapgit_xml_input.clas.testclasses.abap
index 569e80909..1e9745d43 100644
--- a/src/xml/zcl_abapgit_xml_input.clas.testclasses.abap
+++ b/src/xml/zcl_abapgit_xml_input.clas.testclasses.abap
@@ -20,7 +20,7 @@ CLASS ltcl_xml DEFINITION FOR TESTING DURATION SHORT RISK LEVEL HARMLESS.
              moo TYPE f,
            END OF st_new.
 
-ENDCLASS.       "ltcl_Xml
+ENDCLASS.
 
 
 CLASS ltcl_xml IMPLEMENTATION.
diff --git a/src/xml/zcl_abapgit_xml_output.clas.abap b/src/xml/zcl_abapgit_xml_output.clas.abap
index ed58bd792..2175cf730 100644
--- a/src/xml/zcl_abapgit_xml_output.clas.abap
+++ b/src/xml/zcl_abapgit_xml_output.clas.abap
@@ -138,10 +138,10 @@ CLASS ZCL_ABAPGIT_XML_OUTPUT IMPLEMENTATION.
 
     rv_xml = to_xml( iv_normalize ).
 
-  ENDMETHOD.                    "render
+  ENDMETHOD.
 
 
   METHOD set_raw.
     mi_raw = ii_raw.
-  ENDMETHOD.                    "set_raw
+  ENDMETHOD.
 ENDCLASS.
diff --git a/src/zlib/zcl_abapgit_zlib.clas.abap b/src/zlib/zcl_abapgit_zlib.clas.abap
index fecd3a9f7..6bf8b7a8d 100644
--- a/src/zlib/zcl_abapgit_zlib.clas.abap
+++ b/src/zlib/zcl_abapgit_zlib.clas.abap
@@ -72,7 +72,7 @@ CLASS ZCL_ABAPGIT_ZLIB IMPLEMENTATION.
       CONCATENATE gv_out lv_x INTO gv_out IN BYTE MODE.
     ENDDO.
 
-  ENDMETHOD.                    "copy_out
+  ENDMETHOD.
 
 
   METHOD decode.
@@ -103,7 +103,7 @@ CLASS ZCL_ABAPGIT_ZLIB IMPLEMENTATION.
       lv_first = lv_first * 2.
     ENDDO.
 
-  ENDMETHOD.                    "decode
+  ENDMETHOD.
 
 
   METHOD decompress.
@@ -159,7 +159,7 @@ CLASS ZCL_ABAPGIT_ZLIB IMPLEMENTATION.
     rs_data-raw = gv_out.
     rs_data-compressed_len = xstrlen( iv_compressed ) - go_stream->remaining( ).
 
-  ENDMETHOD.                    "decompress
+  ENDMETHOD.
 
 
   METHOD dynamic.
@@ -253,7 +253,7 @@ CLASS ZCL_ABAPGIT_ZLIB IMPLEMENTATION.
       EXPORTING
         it_lengths = lt_dists.
 
-  ENDMETHOD.                    "dynamic
+  ENDMETHOD.
 
 
   METHOD fixed.
@@ -287,7 +287,7 @@ CLASS ZCL_ABAPGIT_ZLIB IMPLEMENTATION.
       EXPORTING
         it_lengths = lt_lengths.
 
-  ENDMETHOD.                    "fixed
+  ENDMETHOD.
 
 
   METHOD map_distance.
@@ -362,7 +362,7 @@ CLASS ZCL_ABAPGIT_ZLIB IMPLEMENTATION.
         ASSERT 1 = 0.
     ENDCASE.
 
-  ENDMETHOD.                    "map_distance
+  ENDMETHOD.
 
 
   METHOD map_length.
@@ -435,7 +435,7 @@ CLASS ZCL_ABAPGIT_ZLIB IMPLEMENTATION.
         ASSERT 1 = 0.
     ENDCASE.
 
-  ENDMETHOD.                    "map_length
+  ENDMETHOD.
 
 
   METHOD read_pair.
@@ -448,5 +448,5 @@ CLASS ZCL_ABAPGIT_ZLIB IMPLEMENTATION.
     lv_symbol = decode( go_distcode ).
     rs_pair-distance = map_distance( lv_symbol ).
 
-  ENDMETHOD.                    "read_pair
+  ENDMETHOD.
 ENDCLASS.
diff --git a/src/zlib/zcl_abapgit_zlib_convert.clas.abap b/src/zlib/zcl_abapgit_zlib_convert.clas.abap
index 5102f7257..3e957e241 100644
--- a/src/zlib/zcl_abapgit_zlib_convert.clas.abap
+++ b/src/zlib/zcl_abapgit_zlib_convert.clas.abap
@@ -40,7 +40,7 @@ CLASS ZCL_ABAPGIT_ZLIB_CONVERT IMPLEMENTATION.
       lv_bits = lv_bits+1.
     ENDWHILE.
 
-  ENDMETHOD.                    "bits_to_int
+  ENDMETHOD.
 
 
   METHOD hex_to_bits.
@@ -62,7 +62,7 @@ CLASS ZCL_ABAPGIT_ZLIB_CONVERT IMPLEMENTATION.
       lv_hex = lv_hex+1.
     ENDWHILE.
 
-  ENDMETHOD.                    "hex_to_bits
+  ENDMETHOD.
 
 
   METHOD int_to_hex.
@@ -73,5 +73,5 @@ CLASS ZCL_ABAPGIT_ZLIB_CONVERT IMPLEMENTATION.
     lv_x = iv_int.
     rv_hex = lv_x.
 
-  ENDMETHOD.                    "int_to_hex
+  ENDMETHOD.
 ENDCLASS.
diff --git a/src/zlib/zcl_abapgit_zlib_huffman.clas.abap b/src/zlib/zcl_abapgit_zlib_huffman.clas.abap
index 9ccffe0f3..02423204f 100644
--- a/src/zlib/zcl_abapgit_zlib_huffman.clas.abap
+++ b/src/zlib/zcl_abapgit_zlib_huffman.clas.abap
@@ -82,15 +82,15 @@ CLASS ZCL_ABAPGIT_ZLIB_HUFFMAN IMPLEMENTATION.
       <lv_offset> = <lv_offset> + 1.
     ENDDO.
 
-  ENDMETHOD.                    "constructor
+  ENDMETHOD.
 
 
   METHOD get_count.
     READ TABLE mt_count INDEX iv_index INTO rv_value.     "#EC CI_SUBRC
-  ENDMETHOD.                    "count
+  ENDMETHOD.
 
 
   METHOD get_symbol.
     READ TABLE mt_symbol INDEX iv_index INTO rv_value.    "#EC CI_SUBRC
-  ENDMETHOD.                    "symbol
+  ENDMETHOD.
 ENDCLASS.
diff --git a/src/zlib/zcl_abapgit_zlib_stream.clas.abap b/src/zlib/zcl_abapgit_zlib_stream.clas.abap
index 8ecf6468d..1a8a4388d 100644
--- a/src/zlib/zcl_abapgit_zlib_stream.clas.abap
+++ b/src/zlib/zcl_abapgit_zlib_stream.clas.abap
@@ -35,14 +35,14 @@ CLASS ZCL_ABAPGIT_ZLIB_STREAM IMPLEMENTATION.
 
     mv_compressed = iv_data.
 
-  ENDMETHOD.                    "constructor
+  ENDMETHOD.
 
 
   METHOD remaining.
 
     rv_length = xstrlen( mv_compressed ) + 1.
 
-  ENDMETHOD.                    "remaining
+  ENDMETHOD.
 
 
   METHOD take_bits.
@@ -70,12 +70,12 @@ CLASS ZCL_ABAPGIT_ZLIB_STREAM IMPLEMENTATION.
 
     ENDWHILE.
 
-  ENDMETHOD.                    "take_bits
+  ENDMETHOD.
 
 
   METHOD take_int.
 
     rv_int = zcl_abapgit_zlib_convert=>bits_to_int( take_bits( iv_length ) ).
 
-  ENDMETHOD.                    "take_int
+  ENDMETHOD.
 ENDCLASS.
diff --git a/src/zlib/zcl_abapgit_zlib_stream.clas.testclasses.abap b/src/zlib/zcl_abapgit_zlib_stream.clas.testclasses.abap
index eba3361d2..abd9ad7e9 100644
--- a/src/zlib/zcl_abapgit_zlib_stream.clas.testclasses.abap
+++ b/src/zlib/zcl_abapgit_zlib_stream.clas.testclasses.abap
@@ -6,7 +6,7 @@ CLASS ltcl_test DEFINITION FOR TESTING
   PRIVATE SECTION.
     METHODS: test FOR TESTING.
 
-ENDCLASS.       "ltcl_Test
+ENDCLASS.
 
 
 CLASS ltcl_test IMPLEMENTATION.