Cleanup scraper global functions, indentation