Fix Sonar Issues: Comments should not appear on the end of a line