Cleaned up CSO scraper