Finished the cleaner scraping algorithm. It's faster too