Tweaked comment structure