Fix scrape errors, plus change formating