improved content cleaning