add content_type and remove some comments