Tweaked commenting