I think so. Maybe with a toggle for [any reference / comments / both] but I will leave the default as you have it now.