Enhance comments