Reformatted datascraper.py; began work on patch2.py to bring other instances of data scraper in line with current code.