Fix and clean Content model