[CLEANUP] Fix length of comments to meet CGL