Tweaked commenting feature