Refactored cleaning of Chordie scrape