Corrected comments wrapper