Style improvements
Start working on data scraper